(fortran-mode): Set font-lock-syntactic-keywords via font-lock-defaults.

2 files changed, 7 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5206d124625..31f5ff2f76a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index bcb571f8c87..098cc8b8d82 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -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 @@ You might want to change this to \"*\", for instance."
 ;; 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 @@ with no args, if that value is non-nil."
           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)