comparison lisp/files.el @ 112098:40af77a50adc

Merge changes from emacs-23 branch
author Chong Yidong <cyd@stupidchicken.com>
date Sun, 02 Jan 2011 15:28:40 -0500
parents 2fef20daac2b 290ee662951b
children b30a0deacfdf
comparison
equal deleted inserted replaced
112045:52100bac91db 112098:40af77a50adc
1 ;;; files.el --- file input and output commands for Emacs 1 ;;; files.el --- file input and output commands for Emacs
2 2
3 ;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996, 3 ;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996,
4 ;; 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 4 ;; 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
5 ;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 5 ;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
6 6
7 ;; Maintainer: FSF 7 ;; Maintainer: FSF
8 ;; Package: emacs 8 ;; Package: emacs
9 9
10 ;; This file is part of GNU Emacs. 10 ;; This file is part of GNU Emacs.
2874 Each element in this list has the form (VAR . VALUE), where VAR 2874 Each element in this list has the form (VAR . VALUE), where VAR
2875 is a file-local variable (a symbol) and VALUE is the value 2875 is a file-local variable (a symbol) and VALUE is the value
2876 specified. The actual value in the buffer may differ from VALUE, 2876 specified. The actual value in the buffer may differ from VALUE,
2877 if it is changed by the major or minor modes, or by the user.") 2877 if it is changed by the major or minor modes, or by the user.")
2878 (make-variable-buffer-local 'file-local-variables-alist) 2878 (make-variable-buffer-local 'file-local-variables-alist)
2879 (put 'file-local-variables-alist 'permanent-local t)
2879 2880
2880 (defvar dir-local-variables-alist nil 2881 (defvar dir-local-variables-alist nil
2881 "Alist of directory-local variable settings in the current buffer. 2882 "Alist of directory-local variable settings in the current buffer.
2882 Each element in this list has the form (VAR . VALUE), where VAR 2883 Each element in this list has the form (VAR . VALUE), where VAR
2883 is a directory-local variable (a symbol) and VALUE is the value 2884 is a directory-local variable (a symbol) and VALUE is the value