diff options
| author | Glenn Morris <[email protected]> | 2011-08-19 14:23:09 -0400 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2011-08-19 14:23:09 -0400 |
| commit | 9234ff7fcfa79c5e19b9d3a7ae88570f4f768b9a (patch) | |
| tree | d1e9d52c9e1ed115776f74322f687801b6d37c4e /lisp | |
| parent | 823564e519dd1f3e81a79949e1abc033c9e7c0a5 (diff) | |
files.el fix for bug#9331
* lisp/files.el (hack-local-variables-prop-line, hack-local-variables):
Downcase "Mode:".
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/files.el | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 38c536af62..fcccc80220 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-08-19 Glenn Morris <[email protected]> + + * files.el (hack-local-variables-prop-line, hack-local-variables): + Downcase "Mode:". (Bug#9331) + 2011-08-18 Chong Yidong <[email protected]> * international/characters.el: Add L and R categories. diff --git a/lisp/files.el b/lisp/files.el index 6b8a352f20..8c7e63dda1 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) |