aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/files.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index efacb110d1b..2e06de9fd98 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-08-20 Glenn Morris <rgm@gnu.org>
2
3 * files.el (hack-local-variables): Fully ignore case for "mode:".
4
12011-08-20 Alan Mackenzie <acm@muc.de> 52011-08-20 Alan Mackenzie <acm@muc.de>
2 6
3 Resolve invalid use of a regexp in regexp-opt. 7 Resolve invalid use of a regexp in regexp-opt.
diff --git a/lisp/files.el b/lisp/files.el
index 8c7e63dda14..07188e152b3 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3154,7 +3154,8 @@ major-mode."
3154 (var (let ((read-circle nil)) 3154 (var (let ((read-circle nil))
3155 (read str))) 3155 (read str)))
3156 val val2) 3156 val val2)
3157 (and (eq var 'Mode) (setq var 'mode)) 3157 (and (equal (downcase (symbol-name var)) "mode")
3158 (setq var 'mode))
3158 ;; Read the variable value. 3159 ;; Read the variable value.
3159 (skip-chars-forward "^:") 3160 (skip-chars-forward "^:")
3160 (forward-char 1) 3161 (forward-char 1)