diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-09-07 15:07:13 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-09-07 15:07:13 +0000 |
| commit | a227f163200d86d34b661ab9eb007f7b3cb8bf88 (patch) | |
| tree | 5aebbc74164a73f81536aeb0d95299c9442bd119 | |
| parent | 5c7ffa04880b603a5851980e608e97e02e6c86de (diff) | |
| download | emacs-a227f163200d86d34b661ab9eb007f7b3cb8bf88.tar.gz | |
(fortran-mode): Set font-lock-syntactic-keywords via font-lock-defaults.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/progmodes/fortran.el | 9 |
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) |