diff options
author | Stefan Monnier <[email protected]> | 2009-02-12 05:34:26 +0000 |
---|---|---|
committer | Stefan Monnier <[email protected]> | 2009-02-12 05:34:26 +0000 |
commit | 7664ec4458446c2782265f18fa0d80cb560b33a0 (patch) | |
tree | d584c4a87c91dd4fdc26e81956378ec1bb551578 /lisp/progmodes/verilog-mode.el | |
parent | f9f34ece3da8c2c8c9983bb685ec5151f2955d93 (diff) |
(verilog-mode): Avoid circular use of syntax-ppss.
Diffstat (limited to 'lisp/progmodes/verilog-mode.el')
-rw-r--r-- | lisp/progmodes/verilog-mode.el | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 8670d66864..330b8145d6 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -2373,6 +2373,8 @@ Use filename, if current buffer being edited shorten to just buffer name." ;; Fontify things in translate off regions '(verilog-match-translate-off (0 'verilog-font-lock-translate-off-face prepend)))))) + ;; FIXME: This XEmacs setting is redundant with the setting done later + ;; for Emacs (because XEmacs obeys Emacs's setting as well). (put 'verilog-mode 'font-lock-defaults '((verilog-font-lock-keywords verilog-font-lock-keywords-1 @@ -2560,10 +2562,17 @@ Key bindings specific to `verilog-mode-map' are: ;; Stuff for GNU Emacs (set (make-local-variable 'font-lock-defaults) - '((verilog-font-lock-keywords verilog-font-lock-keywords-1 + `((verilog-font-lock-keywords verilog-font-lock-keywords-1 verilog-font-lock-keywords-2 verilog-font-lock-keywords-3) - nil nil nil verilog-beg-of-defun)) + nil nil nil + ,(if (functionp 'syntax-ppss) + ;; verilog-beg-of-defun uses syntax-ppss, and syntax-ppss uses + ;; font-lock-beginning-of-syntax-function, so + ;; font-lock-beginning-of-syntax-function, can't use + ;; verilog-beg-of-defun. + nil + 'verilog-beg-of-defun))) ;;------------------------------------------------------------ ;; now hook in 'verilog-colorize-include-files (eldo-mode.el&spice-mode.el) ;; all buffer local: |