# HG changeset patch # User Stefan Monnier # Date 1234416866 0 # Node ID e2dc5f14229e0776d65011ae1d67dd5f7511d6b8 # Parent db03a07a8e3ed0152487d628c691ff5eb706de54 (verilog-mode): Avoid circular use of syntax-ppss. diff -r db03a07a8e3e -r e2dc5f14229e lisp/ChangeLog --- a/lisp/ChangeLog Thu Feb 12 04:31:01 2009 +0000 +++ b/lisp/ChangeLog Thu Feb 12 05:34:26 2009 +0000 @@ -1,5 +1,8 @@ 2009-02-12 Stefan Monnier + * progmodes/verilog-mode.el (verilog-mode): Avoid circular use of + syntax-ppss. + * emacs-lisp/lisp.el (end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw. diff -r db03a07a8e3e -r e2dc5f14229e lisp/progmodes/verilog-mode.el --- a/lisp/progmodes/verilog-mode.el Thu Feb 12 04:31:01 2009 +0000 +++ b/lisp/progmodes/verilog-mode.el Thu Feb 12 05:34:26 2009 +0000 @@ -2373,6 +2373,8 @@ ;; 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 @@ ;; 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: