* lisp/files.el (file-local-variables-alist): Make permanent-local.

Fixes: debbugs:7767

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.