From: Glenn Morris <rgm@gnu.org>
Date: Wed, 10 Jun 2015 20:38:18 +0000 (-0400)
Subject: * lisp/files-x.el (add-file-local-variable):
X-Git-Tag: emacs-25.0.90~1809
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6bf9bdb4b155f3f330c0e2b6eb00c45c8e01f54b;p=emacs.git

* lisp/files-x.el (add-file-local-variable):

Special-case 'lexical-binding'.  (Bug#20641)
---

diff --git a/lisp/files-x.el b/lisp/files-x.el
index 248c3073307..a130ffcf928 100644
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -247,7 +247,14 @@ then this function adds the first line containing the string
 `Local Variables:' and the last line containing the string `End:'."
   (interactive
    (let ((variable (read-file-local-variable "Add file-local variable")))
+     ;; Error before reading value.
+     (if (equal variable 'lexical-binding)
+	 (user-error "The `%s' variable must be set at the start of the file"
+		     variable))
      (list variable (read-file-local-variable-value variable) t)))
+  (if (equal variable 'lexical-binding)
+      (user-error "The `%s' variable must be set at the start of the file"
+                  variable))
   (modify-file-local-variable variable value 'add-or-replace interactive))
 
 ;;;###autoload