[Emacs-diffs] /srv/bzr/emacs/trunk r105499: files.el fix for bug#9331

[Glenn Morris]

------------------------------------------------------------
revno: 105499
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2011-08-19 14:23:09 -0400
message:
  files.el fix for bug#9331
  
  * lisp/files.el (hack-local-variables-prop-line, hack-local-variables):
  Downcase "Mode:".
modified:
  lisp/ChangeLog
  lisp/files.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-08-18 15:53:29 +0000
+++ b/lisp/ChangeLog    2011-08-19 18:23:09 +0000
@@ -1,3 +1,8 @@
+2011-08-19  Glenn Morris  <address@hidden>
+
+       * files.el (hack-local-variables-prop-line, hack-local-variables):
+       Downcase "Mode:". (Bug#9331)
+
 2011-08-18  Chong Yidong  <address@hidden>
 
        * international/characters.el: Add L and R categories.

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2011-07-16 20:01:37 +0000
+++ b/lisp/files.el     2011-08-19 18:23:09 +0000
@@ -3003,9 +3003,10 @@
                                                "-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 @@
                           (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)