[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100347: * lisp/files.el (file-local-variables-alist): Make permanent-local.

[Stefan Monnier]

------------------------------------------------------------
revno: 100347
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Sat 2011-01-01 22:57:26 -0500
message:
  * lisp/files.el (file-local-variables-alist): Make permanent-local.
modified:
  lisp/ChangeLog
  lisp/files.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-02 03:16:03 +0000
+++ b/lisp/ChangeLog    2011-01-02 03:57:26 +0000
@@ -1,3 +1,8 @@
+2011-01-02  Stefan Monnier  <address@hidden>
+
+       * files.el (file-local-variables-alist):
+       Make permanent-local (bug#7767).
+
 2011-01-02  Mark Lillibridge  <address@hidden>  (tiny change)
 
        * mail/mail-utils.el (mail-strip-quoted-names): Don't modify the

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2010-12-04 21:45:17 +0000
+++ b/lisp/files.el     2011-01-02 03:57:26 +0000
@@ -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.