# HG changeset patch # User Stefan Monnier <monnier@iro.umontreal.ca> # Date 1189177633 0 # Node ID 5368313283054a4b1f47cfa60df81d2c1ff926b6 # Parent 5ee0e4e08f916371868bbe513adacc95e480c258 (fortran-mode): Set font-lock-syntactic-keywords via font-lock-defaults. diff -r 5ee0e4e08f91 -r 536831328305 lisp/ChangeLog --- a/lisp/ChangeLog Fri Sep 07 15:04:09 2007 +0000 +++ b/lisp/ChangeLog Fri Sep 07 15:07:13 2007 +0000 @@ -1,5 +1,8 @@ 2007-09-07 Stefan Monnier <monnier@iro.umontreal.ca> + * progmodes/fortran.el (fortran-mode): Set font-lock-syntactic-keywords + via font-lock-defaults. + * emacs-lisp/bytecomp.el (byte-compile-log-file): Check major-mode via derived-mode-p. diff -r 5ee0e4e08f91 -r 536831328305 lisp/progmodes/fortran.el --- a/lisp/progmodes/fortran.el Fri Sep 07 15:04:09 2007 +0000 +++ b/lisp/progmodes/fortran.el Fri Sep 07 15:07:13 2007 +0000 @@ -56,7 +56,6 @@ ;; silence compiler (defvar dabbrev-case-fold-search) -(defvar font-lock-syntactic-keywords) (defvar gud-find-expr-function) (defvar imenu-case-fold-search) (defvar imenu-syntax-alist) @@ -151,7 +150,7 @@ ;; filling and doesn't seem to be necessary. (defcustom fortran-comment-line-start-skip "^[CcDd*!]\\(\\([^ \t\n]\\)\\2+\\)?[ \t]*" - "*Regexp to match the start of a full-line comment." + "Regexp to match the start of a full-line comment." :version "21.1" :type 'regexp :group 'fortran-comment) @@ -827,9 +826,9 @@ fortran-font-lock-keywords-3 fortran-font-lock-keywords-4) nil t ((?/ . "$/") ("_$" . "w")) - fortran-beginning-of-subprogram)) - (set (make-local-variable 'font-lock-syntactic-keywords) - (fortran-font-lock-syntactic-keywords)) + fortran-beginning-of-subprogram + (font-lock-syntactic-keywords + . (fortran-font-lock-syntactic-keywords)))) (set (make-local-variable 'imenu-case-fold-search) t) (set (make-local-variable 'imenu-generic-expression) fortran-imenu-generic-expression)