summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/progmodes/fortran.el2
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6da44486f50..f1d081cce2a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-07 Glenn Morris <rgm@gnu.org>
+
+ * subr.el (ignore-errors): Move here from cl-macs.el.
+ * emacs-lisp/cl-macs.el (ignore-errors): Move to subr.el.
+
+ * progmodes/fortran.el (fortran-mode): Fix font-lock-syntactic-keywords
+ oddness.
+
2008-05-06 Eric S. Raymond <esr@snark.thyrsus.com>
* vc-hooks.el (vc-find-file-hook),
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 3d6d2914a5c..467237ae1a6 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -849,7 +849,7 @@ with no args, if that value is non-nil."
nil t ((?/ . "$/") ("_$" . "w"))
fortran-beginning-of-subprogram
(font-lock-syntactic-keywords
- . (fortran-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)