files.el fix for bug#9331

* lisp/files.el (hack-local-variables-prop-line, hack-local-variables):
Downcase "Mode:".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 38c536af62c051b99e69376e8090c4d0f05bb9e6..fcccc80220319745206b57c5bb819bd850440363 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-19  Glenn Morris  <rgm@gnu.org>
+
+       * files.el (hack-local-variables-prop-line, hack-local-variables):
+       Downcase "Mode:". (Bug#9331)
+
 2011-08-18  Chong Yidong  <cyd@stupidchicken.com>
 
        * international/characters.el: Add L and R categories.

diff --git a/lisp/files.el b/lisp/files.el
index 6b8a352f20cdab66f181df47b15d9011084ee708..8c7e63dda149ca28305825b4f9825514d485c7d1 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3003,9 +3003,10 @@ mode, if there is one, otherwise nil."
                                                "-mode"))))
                   (or (equal keyname "coding")
                       (condition-case nil
-                          (push (cons (if (eq key 'eval)
-                                          'eval
-                                        (indirect-variable key))
+                          (push (cons (cond ((eq key 'eval) 'eval)
+                                            ;; Downcase "Mode:".
+                                            ((equal keyname "mode") 'mode)
+                                            (t (indirect-variable key)))
                                       val) result)
                         (error nil))))
                 (skip-chars-forward " \t;")))
@@ -3153,6 +3154,7 @@ major-mode."
                           (var (let ((read-circle nil))
                                  (read str)))
                           val val2)
+                     (and (eq var 'Mode) (setq var 'mode))
                      ;; Read the variable value.
                      (skip-chars-forward "^:")
                      (forward-char 1)