[Emacs-diffs] emacs/lisp ChangeLog progmodes/verilog-mode.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/02/12 05:34:29

Modified files:
        lisp           : ChangeLog 
        lisp/progmodes : verilog-mode.el 

Log message:
        (verilog-mode): Avoid circular use of syntax-ppss.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15307&r2=1.15308
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/verilog-mode.el?cvsroot=emacs&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15307
retrieving revision 1.15308
diff -u -b -r1.15307 -r1.15308
--- ChangeLog   12 Feb 2009 04:31:01 -0000      1.15307
+++ ChangeLog   12 Feb 2009 05:34:26 -0000      1.15308
@@ -1,5 +1,8 @@
 2009-02-12  Stefan Monnier  <address@hidden>
 
+       * 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.
 

Index: progmodes/verilog-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/verilog-mode.el,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- progmodes/verilog-mode.el   9 Jan 2009 04:16:03 -0000       1.26
+++ progmodes/verilog-mode.el   12 Feb 2009 05:34:28 -0000      1.27
@@ -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: