Merge from origin/emacs-25

[gnu-emacs] / doc / emacs / custom.texi

diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 8441c889bbffdb49d44f34229617aeebe42a11c7..7be660c85d11ea4a29cf43788dfb8774040cfec8 100644 (file)
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8 -*-
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software
 @c Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Customization
@@ -403,6 +403,8 @@ customizations in your initialization file.  This is because saving
 customizations from such a session would wipe out all the other
 customizations you might have on your initialization file.
 
+@cindex unsaved customizations, reminder to save
+@findex custom-prompt-customize-unsaved-options
   Please note that any customizations you have not chosen to save for
 future sessions will be lost when you terminate Emacs.  If you'd like
 to be prompted about unsaved customizations at termination time, add
@@ -1131,6 +1133,12 @@ won't confuse other programs that the file is intended for.  The
 example above is for the C programming language, where comments start
 with @samp{/*} and end with @samp{*/}.
 
+If some unrelated text might look to Emacs as a local variables list,
+you can countermand that by inserting a form-feed character (a page
+delimiter, @pxref{Pages}) after that text.  Emacs only looks for
+file-local variables in the last page of a file, after the last page
+delimiter.
+
 @findex add-file-local-variable
 @findex delete-file-local-variable
 @findex copy-dir-locals-to-file-locals
@@ -1291,8 +1299,8 @@ named @file{.dir-locals.el}@footnote{ On MS-DOS, the name of this file
 should be @file{_dir-locals.el}, due to limitations of the DOS
 filesystems.  If the filesystem is limited to 8+3 file names, the name
 of the file will be truncated by the OS to @file{_dir-loc.el}.
-}@footnote{ You can also use files like @file{.dir-locals2.el}, which
-are loaded in addition.  This is useful when @file{.dir-locals.el} is
+}@footnote{ You can also use @file{.dir-locals-2.el}, which
+is loaded in addition.  This is useful when @file{.dir-locals.el} is
 under version control in a shared repository and can't be used for
 personal customizations.  } in a
 directory.  Whenever Emacs visits any file in that directory or any of