# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1293940646 18000
# Node ID 290ee662951b5aaec48f3d869f408ece4f4c4e6e
# Parent  96d88ed184381b7d59ce3d804f7b19615dd42dc1
* lisp/files.el (file-local-variables-alist): Make permanent-local.

diff -r 96d88ed18438 -r 290ee662951b lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jan 01 22:16:03 2011 -0500
+++ b/lisp/ChangeLog	Sat Jan 01 22:57:26 2011 -0500
@@ -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 -r 96d88ed18438 -r 290ee662951b lisp/files.el
--- a/lisp/files.el	Sat Jan 01 22:16:03 2011 -0500
+++ b/lisp/files.el	Sat Jan 01 22:57:26 2011 -0500
@@ -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 @@
 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.