aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/fortran.el4
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cbc75182f0f..c3930f27a6d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12012-06-11 Glenn Morris <rgm@gnu.org>
2
3 * progmodes/fortran.el (fortran-font-lock-keywords-3):
4 Use preprocessor face for directives.
5 (fortran-directive-re): Doc fix.
6
12012-06-11 Stefan Monnier <monnier@iro.umontreal.ca> 72012-06-11 Stefan Monnier <monnier@iro.umontreal.ca>
2 8
3 * emacs-lisp/cl-macs.el (cl-parse-loop-clause): Fix error in recent 9 * emacs-lisp/cl-macs.el (cl-parse-loop-clause): Fix error in recent
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 8d488fe9be4..665b0767b2c 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -165,7 +165,7 @@ allow trailing comments on a line."
165(defcustom fortran-directive-re 165(defcustom fortran-directive-re
166 "^[ \t]*#.*" 166 "^[ \t]*#.*"
167 "Regexp to match a directive line. 167 "Regexp to match a directive line.
168The matching text will be fontified with `font-lock-keyword-face'. 168The matching text will be fontified with `font-lock-preprocessor-face'.
169The matching line will be given zero indentation." 169The matching line will be given zero indentation."
170 :version "22.1" 170 :version "22.1"
171 :type 'regexp 171 :type 'regexp
@@ -452,7 +452,7 @@ The only difference is, it returns t in a case when the default returns nil."
452 ;; Standard continuation character and in a TAB-formatted line. 452 ;; Standard continuation character and in a TAB-formatted line.
453 '("^ \\{5\\}\\([^ 0\n]\\)" 1 font-lock-string-face) 453 '("^ \\{5\\}\\([^ 0\n]\\)" 1 font-lock-string-face)
454 '("^\t\\([1-9]\\)" 1 font-lock-string-face)) 454 '("^\t\\([1-9]\\)" 1 font-lock-string-face))
455 `((,fortran-directive-re (0 font-lock-keyword-face t))) 455 `((,fortran-directive-re (0 font-lock-preprocessor-face t)))
456 ;; `fortran-font-lock-keywords-2' without types (see above). 456 ;; `fortran-font-lock-keywords-2' without types (see above).
457 (cdr (nthcdr (length fortran-font-lock-keywords-1) 457 (cdr (nthcdr (length fortran-font-lock-keywords-1)
458 fortran-font-lock-keywords-2))) 458 fortran-font-lock-keywords-2)))