summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2011-01-01 22:57:26 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2011-01-01 22:57:26 -0500
commit2a8a455e77ee928a76268ab1ff5be1787af6525a (patch)
tree164bd541bd0d43520e1a6d7ac0755102d1602426
parent2f9520592df6d3352777f227f66aede98cf503e8 (diff)
downloademacs-2a8a455e77ee928a76268ab1ff5be1787af6525a.tar.gz
* lisp/files.el (file-local-variables-alist): Make permanent-local.
Fixes: debbugs:7767
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/files.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f321eb22d94..8a0cdd74d7d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-02 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * files.el (file-local-variables-alist):
+ Make permanent-local (bug#7767).
+
2011-01-02 Mark Lillibridge <mark.lillibridge@hp.com> (tiny change)
* mail/mail-utils.el (mail-strip-quoted-names): Don't modify the
diff --git a/lisp/files.el b/lisp/files.el
index 70d514d16ec..690caf13960 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2,7 +2,7 @@
;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996,
;; 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Maintainer: FSF
@@ -2788,6 +2788,7 @@ is a file-local variable (a symbol) and VALUE is the value
specified. The actual value in the buffer may differ from VALUE,
if it is changed by the major or minor modes, or by the user.")
(make-variable-buffer-local 'file-local-variables-alist)
+(put 'file-local-variables-alist 'permanent-local t)
(defvar dir-local-variables-alist nil
"Alist of directory-local variable settings in the current buffer.