2 files changed, 6 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b21d311bac..20528d7c070 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-26  Glenn Morris  <rgm@gnu.org>
 
+        * files.el (hack-local-variables-prop-line, hack-local-variables):
+        Downcase mode names, as seems to be traditional.
+
         * mail/emacsbug.el (report-emacs-bug): Mention checking From address.
         (report-emacs-bug-hook): Try to validate the From address.  (Bug#8038)
 
diff --git a/lisp/files.el b/lisp/files.el
index 2dad1b0eeb5..9749e9d75ef 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3078,7 +3078,8 @@ mode, if there is one, otherwise nil."
                  (if mode-only
                      (and (equal keyname "mode")
                           (setq result
-                                (intern (concat (symbol-name val) "-mode"))))
+                                (intern (concat (downcase (symbol-name val))
+                                                "-mode"))))
                    (or (equal keyname "coding")
                        (condition-case nil
                            (push (cons (if (eq key 'eval)
@@ -3240,7 +3241,7 @@ major-mode."
                                ;; deprecated, but try to reject them anyway.
                                (not (string-match
                                      "-minor\\'"
-                                     (setq val2 (symbol-name val))))
+                                     (setq val2 (downcase (symbol-name val)))))
                                (setq result (intern (concat val2 "-mode"))))
                         (unless (eq var 'coding)
                           (condition-case nil