files.el fix for bug#9331

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

2 files changed, 10 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 38c536af62c..fcccc802203 100644
--- 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 6b8a352f20c..8c7e63dda14 100644
--- 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)