Merge from mainline.

[gnu-emacs] / doc / lispref / backups.texi

diff --git a/doc/lispref/backups.texi b/doc/lispref/backups.texi
index c710ac190bca96fb500edc65a8f2a62f929c47bd..aad0cbc146aea19fd84acc5724b8a6d00cdbd0d2 100644 (file)
--- a/doc/lispref/backups.texi
+++ b/doc/lispref/backups.texi
@@ -1,7 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2001, 2002, 2003,
-@c   2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+@c Copyright (C) 1990-1995, 1999, 2001-2011  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../../info/backups
 @node Backups and Auto-Saving, Buffers, Files, Top
@@ -88,10 +87,8 @@ save disk space.  (You would put this code in your init file.)
 @smallexample
 @group
 (add-hook 'rmail-mode-hook
-          (function (lambda ()
-                      (make-local-variable
-                       'make-backup-files)
-                      (setq make-backup-files nil))))
+          (lambda ()
+            (set (make-local-variable 'make-backup-files) nil)))
 @end group
 @end smallexample
 @end defopt
@@ -122,7 +119,7 @@ its value.  Major modes should not set this variable---they should set
 @code{make-backup-files} instead.
 @end defvar
 
-@defvar backup-directory-alist
+@defopt backup-directory-alist
 This variable's value is an alist of filename patterns and backup
 directory names.  Each element looks like
 @smallexample
@@ -147,9 +144,9 @@ backup is made in the original file's directory.
 
 On MS-DOS filesystems without long names this variable is always
 ignored.
-@end defvar
+@end defopt
 
-@defvar make-backup-file-name-function
+@defopt make-backup-file-name-function
 This variable's value is a function to use for making backups instead
 of the default @code{make-backup-file-name}.  A value of @code{nil}
 gives the default @code{make-backup-file-name} behavior.
@@ -158,7 +155,7 @@ gives the default @code{make-backup-file-name} behavior.
 This could be buffer-local to do something special for specific
 files.  If you define it, you may need to change
 @code{backup-file-name-p} and @code{file-name-sans-versions} too.
-@end defvar
+@end defopt
 
 
 @node Rename or Copy
@@ -632,6 +629,10 @@ this buffer due to a substantial decrease in size.  Explicitly saving
 the buffer stores a positive value in this variable, thus reenabling
 auto-saving.  Turning auto-save mode off or on also updates this
 variable, so that the substantial decrease in size is forgotten.
+
+If it is @minus{}2, that means this buffer should disregard changes in
+buffer size; in particular, it should not shut off auto-saving
+temporarily due to changes in buffer size.
 @end defvar
 
 @defvar auto-save-list-file-name
@@ -652,13 +653,13 @@ with @samp{.saves-}.  It also contains the Emacs process @acronym{ID} and the
 host name.
 @end defvar
 
-@defvar auto-save-list-file-prefix
+@defopt auto-save-list-file-prefix
 After Emacs reads your init file, it initializes
 @code{auto-save-list-file-name} (if you have not already set it
 non-@code{nil}) based on this prefix, adding the host name and process
 ID.  If you set this to @code{nil} in your init file, then Emacs does
 not initialize @code{auto-save-list-file-name}.
-@end defvar
+@end defopt
 
 @node Reverting
 @section Reverting
@@ -750,7 +751,3 @@ This normal hook is run by @code{revert-buffer} after inserting
 the modified contents---but only if @code{revert-buffer-function} is
 @code{nil}.
 @end defvar
-
-@ignore
-   arch-tag: 295a6321-e5ab-46d5-aef5-0bb4f447a67f
-@end ignore