[Emacs-diffs] emacs/lisp ChangeLog files.el

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     09/12/17 01:18:18

Modified files:
        lisp           : ChangeLog files.el 

Log message:
        Fix regression from 23.1 to allow multiple modes in Local Variables.
        
        * files.el (hack-local-variables-filter): While ignoring duplicates,
        don't take `mode' into account.
        (hack-local-variables-filter, hack-dir-local-variables): Don't
        remove duplicate `mode' from local-variables-alist (like `eval').

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16911&r2=1.16912
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1102&r2=1.1103

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16911
retrieving revision 1.16912
diff -u -b -r1.16911 -r1.16912
--- ChangeLog   17 Dec 2009 01:16:15 -0000      1.16911
+++ ChangeLog   17 Dec 2009 01:18:14 -0000      1.16912
@@ -1,5 +1,14 @@
 2009-12-17  Juri Linkov  <address@hidden>
 
+       Fix regression from 23.1 to allow multiple modes in Local Variables.
+
+       * files.el (hack-local-variables-filter): While ignoring duplicates,
+       don't take `mode' into account.
+       (hack-local-variables-filter, hack-dir-local-variables): Don't
+       remove duplicate `mode' from local-variables-alist (like `eval').
+
+2009-12-17  Juri Linkov  <address@hidden>
+
        Make `dired-diff' more safe.  (Bug#5225)
 
        * dired-aux.el (dired-diff): Signal an error when `file' equals to

Index: files.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/files.el,v
retrieving revision 1.1102
retrieving revision 1.1103
diff -u -b -r1.1102 -r1.1103
--- files.el    25 Nov 2009 17:11:35 -0000      1.1102
+++ files.el    17 Dec 2009 01:18:17 -0000      1.1103
@@ -2978,8 +2978,8 @@
                 (or (eq enable-local-eval t)
                     (hack-one-local-variable-eval-safep (eval (quote val)))
                     (push elt unsafe-vars))))
-             ;; Ignore duplicates in the present list.
-             ((assq var all-vars) nil)
+             ;; Ignore duplicates (except `mode') in the present list.
+             ((and (assq var all-vars) (not (eq var 'mode))) nil)
              ;; Accept known-safe variables.
              ((or (memq var '(mode unibyte coding))
                   (safe-local-variable-p var val))
@@ -2999,7 +2999,7 @@
             (hack-local-variables-confirm all-vars unsafe-vars
                                           risky-vars dir-name))
         (dolist (elt all-vars)
-          (unless (eq (car elt) 'eval)
+          (unless (memq (car elt) '(eval mode))
             (unless dir-name
               (setq dir-local-variables-alist
                     (assq-delete-all (car elt) dir-local-variables-alist)))
@@ -3427,7 +3427,7 @@
                (dir-locals-get-class-variables class) dir-name nil)))
          (when variables
            (dolist (elt variables)
-             (unless (eq (car elt) 'eval)
+             (unless (memq (car elt) '(eval mode))
                (setq dir-local-variables-alist
                      (assq-delete-all (car elt) dir-local-variables-alist)))
              (push elt dir-local-variables-alist))