aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-02-25 17:32:33 +0800
committerChong Yidong2012-02-25 17:32:33 +0800
commitd268b4fe42f1fdb3fb9c641db62b94422f0265ba (patch)
tree0971c27e7032b3921218ea7123c73557b544b10c
parentfa74b241a324c5c44c4223c2d1b4c2fcb605eb72 (diff)
downloademacs-d268b4fe42f1fdb3fb9c641db62b94422f0265ba.tar.gz
emacs-d268b4fe42f1fdb3fb9c641db62b94422f0265ba.zip
Update Backups chapter of Lisp manual.
* doc/lispref/backups.texi (Making Backups): Mention default value of backup-directory-alist. (Rename or Copy): Note that backup-by-copying-when-mismatch is t. (Auto-Saving): New minor mode behavior for auto-save-mode. (Reverting): Add defvar for revert-buffer-in-progress-p.
-rw-r--r--admin/FOR-RELEASE2
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/backups.texi27
-rw-r--r--etc/NEWS14
4 files changed, 33 insertions, 15 deletions
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 12b99e49688..607353dd75e 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -184,7 +184,7 @@ abbrevs.texi
184advice.texi cyd 184advice.texi cyd
185anti.texi 185anti.texi
186back.texi 186back.texi
187backups.texi 187backups.texi cyd
188buffers.texi 188buffers.texi
189commands.texi cyd 189commands.texi cyd
190compile.texi cyd 190compile.texi cyd
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 30abe19d192..c6cb488e7d4 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -5,7 +5,10 @@
5 (Changing Files): Document set-file-selinux-context. 5 (Changing Files): Document set-file-selinux-context.
6 6
7 * backups.texi (Making Backups): Return value of backup-buffer is 7 * backups.texi (Making Backups): Return value of backup-buffer is
8 changed. 8 changed. Mention default value of backup-directory-alist.
9 (Rename or Copy): Note that backup-by-copying-when-mismatch is t.
10 (Auto-Saving): New minor mode behavior for auto-save-mode.
11 (Reverting): Add defvar for revert-buffer-in-progress-p.
9 12
10 * searching.texi (Regexp Backslash): Add index entry (Bug#10869). 13 * searching.texi (Regexp Backslash): Add index entry (Bug#10869).
11 14
diff --git a/doc/lispref/backups.texi b/doc/lispref/backups.texi
index de41efacdeb..2bcb768aea8 100644
--- a/doc/lispref/backups.texi
+++ b/doc/lispref/backups.texi
@@ -140,8 +140,8 @@ For the common case of all backups going into one directory, the alist
140should contain a single element pairing @samp{"."} with the appropriate 140should contain a single element pairing @samp{"."} with the appropriate
141directory name. 141directory name.
142 142
143If this variable is @code{nil}, or it fails to match a filename, the 143If this variable is @code{nil} (the default), or it fails to match a
144backup is made in the original file's directory. 144filename, the backup is made in the original file's directory.
145 145
146On MS-DOS filesystems without long names this variable is always 146On MS-DOS filesystems without long names this variable is always
147ignored. 147ignored.
@@ -192,7 +192,7 @@ significance). @xref{Saving Buffers}.
192 192
193@defopt backup-by-copying 193@defopt backup-by-copying
194If this variable is non-@code{nil}, Emacs always makes backup files by 194If this variable is non-@code{nil}, Emacs always makes backup files by
195copying. 195copying. The default is @code{nil}.
196@end defopt 196@end defopt
197 197
198 The following three variables, when non-@code{nil}, cause the second 198 The following three variables, when non-@code{nil}, cause the second
@@ -201,7 +201,7 @@ treatment of files that don't fall into the special cases.
201 201
202@defopt backup-by-copying-when-linked 202@defopt backup-by-copying-when-linked
203If this variable is non-@code{nil}, Emacs makes backups by copying for 203If this variable is non-@code{nil}, Emacs makes backups by copying for
204files with multiple names (hard links). 204files with multiple names (hard links). The default is @code{nil}.
205 205
206This variable is significant only if @code{backup-by-copying} is 206This variable is significant only if @code{backup-by-copying} is
207@code{nil}, since copying is always used when that variable is 207@code{nil}, since copying is always used when that variable is
@@ -209,8 +209,9 @@ non-@code{nil}.
209@end defopt 209@end defopt
210 210
211@defopt backup-by-copying-when-mismatch 211@defopt backup-by-copying-when-mismatch
212If this variable is non-@code{nil}, Emacs makes backups by copying in cases 212If this variable is non-@code{nil} (the default), Emacs makes backups
213where renaming would change either the owner or the group of the file. 213by copying in cases where renaming would change either the owner or
214the group of the file.
214 215
215The value has no effect when renaming would not alter the owner or 216The value has no effect when renaming would not alter the owner or
216group of the file; that is, for files which are owned by the user and 217group of the file; that is, for files which are owned by the user and
@@ -442,10 +443,11 @@ buffer-auto-save-file-name
442 443
443@deffn Command auto-save-mode arg 444@deffn Command auto-save-mode arg
444When used interactively without an argument, this command is a toggle 445When used interactively without an argument, this command is a toggle
445switch: it turns on auto-saving of the current buffer if it is off, and 446switch: it turns on auto-saving of the current buffer if it is off,
446vice versa. With an argument @var{arg}, the command turns auto-saving 447and vice versa. When called from Lisp with no argument, it turns
447on if the value of @var{arg} is @code{t}, a nonempty list, or a positive 448auto-saving on. With an argument @var{arg}, it turns auto-saving on
448integer. Otherwise, it turns auto-saving off. 449if the value of @var{arg} is @code{t}, a nonempty list, or a positive
450integer; otherwise, it turns auto-saving off.
449@end deffn 451@end deffn
450 452
451@defun auto-save-file-name-p filename 453@defun auto-save-file-name-p filename
@@ -755,3 +757,8 @@ This normal hook is run by @code{revert-buffer} after inserting
755the modified contents---but only if @code{revert-buffer-function} is 757the modified contents---but only if @code{revert-buffer-function} is
756@code{nil}. 758@code{nil}.
757@end defvar 759@end defvar
760
761@defvar revert-buffer-in-progress-p
762This variable is bound to a non-@code{nil} value by
763@code{revert-buffer} while it is working.
764@end defvar
diff --git a/etc/NEWS b/etc/NEWS
index 85f70306a43..6074649b581 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -302,9 +302,9 @@ This requires Emacs to be linked with libselinux at build time.
302 302
303+++ 303+++
304*** Emacs preserves the SELinux file context when backing up, and 304*** Emacs preserves the SELinux file context when backing up, and
305optionally when copying files. To this end, copy-file has an extra 305optionally when copying files. To this end, `copy-file' has an extra
306optional argument, and backup-buffer and friends include the SELinux 306optional argument, and the return value of `backup-buffer' now
307context in their return values. 307includes the SELinux context.
308 308
309+++ 309+++
310*** The new functions file-selinux-context and set-file-selinux-context 310*** The new functions file-selinux-context and set-file-selinux-context
@@ -1019,6 +1019,14 @@ for buffers with dead inferior processes has been generalized.
1019 1019
1020* Incompatible Lisp Changes in Emacs 24.1 1020* Incompatible Lisp Changes in Emacs 24.1
1021 1021
1022+++
1023** The return value of `backup-buffer' has changed.
1024It is now a list of three elements, where the second element is a list
1025describing the original file's SELinux context. If Emacs or the
1026system lacks SELinux cupport, the context list is (nil nil nil nil).
1027See the "Basic SELinux support" entry under "Changes in Emacs 24.1",
1028above.
1029
1022--- 1030---
1023** `char-direction-table' and the associated function `char-direction' 1031** `char-direction-table' and the associated function `char-direction'
1024were deleted. They were buggy and inferior to the new support of 1032were deleted. They were buggy and inferior to the new support of