aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref
diff options
context:
space:
mode:
authorGlenn Morris2013-02-27 22:30:48 -0800
committerGlenn Morris2013-02-27 22:30:48 -0800
commit929aeac608c271b2448dffec29aeea85c69d6bff (patch)
treed49650ea52e9c6f1bc89efae4937057dc9df6bcf /doc/lispref
parente7a1c32dda4ec7d937e9810b23584945286f2e25 (diff)
parentb6e99fe463fd9610eadd181e39aa4b4ba632eb61 (diff)
downloademacs-929aeac608c271b2448dffec29aeea85c69d6bff.tar.gz
emacs-929aeac608c271b2448dffec29aeea85c69d6bff.zip
Merge from emacs-24; up to 2012-12-23T02:41:17Z!rgm@gnu.org
Diffstat (limited to 'doc/lispref')
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/variables.texi2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index c4f45d02a05..42f5b5f5536 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12013-02-28 Bastien Guerry <bzg@gnu.org>
2
3 * variables.texi (File Local Variables): Fix reference.
4
12013-02-24 Eli Zaretskii <eliz@gnu.org> 52013-02-24 Eli Zaretskii <eliz@gnu.org>
2 6
3 * files.texi (Magic File Names): Improve wording and indexing. 7 * files.texi (Magic File Names): Improve wording and indexing.
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 3f4edebfb8b..4bcf7985f0c 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1556,7 +1556,7 @@ an ordinary evaluated argument.
1556 1556
1557 A file can specify local variable values; Emacs uses these to create 1557 A file can specify local variable values; Emacs uses these to create
1558buffer-local bindings for those variables in the buffer visiting that 1558buffer-local bindings for those variables in the buffer visiting that
1559file. @xref{File variables, , Local Variables in Files, emacs, The 1559file. @xref{File Variables, , Local Variables in Files, emacs, The
1560GNU Emacs Manual}, for basic information about file-local variables. 1560GNU Emacs Manual}, for basic information about file-local variables.
1561This section describes the functions and variables that affect how 1561This section describes the functions and variables that affect how
1562file-local variables are processed. 1562file-local variables are processed.