[Emacs-diffs] /srv/bzr/emacs/trunk r111028: Warn if try to set coding in dir-locals (bug#7169)

[Glenn Morris]

------------------------------------------------------------
revno: 111028
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-11-29 14:28:39 -0500
message:
  Warn if try to set coding in dir-locals (bug#7169)
  
  * lisp/files.el (hack-dir-local-variables):
  Warn if try to set coding via dir-locals, since it doesn't work.
modified:
  lisp/ChangeLog
  lisp/files.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-29 01:16:51 +0000
+++ b/lisp/ChangeLog    2012-11-29 19:28:39 +0000
@@ -1,5 +1,8 @@
 2012-11-29  Glenn Morris  <address@hidden>
 
+       * files.el (hack-dir-local-variables): Warn if try to set
+       coding via dir-locals, since it doesn't work.  (Bug#7169)
+
        Add desktop support for restoring vc-dir buffers.  (Bug#10606)
        * vc/vc-dir.el (vc-dir-mode): Autoload it (for desktop restore).
        Set buffer-local value of desktop-save-buffer.

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2012-11-29 01:13:33 +0000
+++ b/lisp/files.el     2012-11-29 19:28:39 +0000
@@ -3682,10 +3682,13 @@
                (dir-locals-get-class-variables class) dir-name nil)))
          (when variables
            (dolist (elt variables)
-             (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))
+             (if (eq (car elt) 'coding)
+                 (display-warning :warning
+                                  "Coding cannot be specified by dir-locals")
+               (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)))
            (hack-local-variables-filter variables dir-name)))))))
 
 (defun hack-dir-local-variables-non-file-buffer ()