aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2014-01-23 19:34:31 -0800
committerGlenn Morris2014-01-23 19:34:31 -0800
commitca5fd02c0640ab7e25bab877d86d0e0adac4985f (patch)
tree467fc716ed37faba4e533d6bde7dbd33567eb2dc /doc
parent6c9cbdf04f11b7799ccaef817a5cc79fe6dac02c (diff)
downloademacs-ca5fd02c0640ab7e25bab877d86d0e0adac4985f.tar.gz
emacs-ca5fd02c0640ab7e25bab877d86d0e0adac4985f.zip
* doc/emacs/files.texi (Interlocking): Copyedit.
* etc/NEWS: Related small edits.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/files.texi7
2 files changed, 8 insertions, 3 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index c10f3e073a0..8ef2f4699ec 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12014-01-24 Glenn Morris <rgm@gnu.org>
2
3 * files.texi (Interlocking): Copyedit.
4
12014-01-23 Glenn Morris <rgm@gnu.org> 52014-01-23 Glenn Morris <rgm@gnu.org>
2 6
3 * building.texi (Lisp Eval): Update prefix argument behavior 7 * building.texi (Lisp Eval): Update prefix argument behavior
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 1b6211a1ee1..3b9aefa332b 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -752,9 +752,10 @@ file.
752@cindex locking files 752@cindex locking files
753 When you make the first modification in an Emacs buffer that is 753 When you make the first modification in an Emacs buffer that is
754visiting a file, Emacs records that the file is @dfn{locked} by you. 754visiting a file, Emacs records that the file is @dfn{locked} by you.
755(It does this by creating a specially-named symbolic link or regular 755(It does this by creating a specially-named symbolic link@footnote{If
756file with special contents in the same directory.) Emacs removes the 756your file system does not support symbolic links, a regular file is
757lock when you save the changes. The idea is that the file is locked 757used.} with special contents in the same directory.) Emacs removes the lock
758when you save the changes. The idea is that the file is locked
758whenever an Emacs buffer visiting it has unsaved changes. 759whenever an Emacs buffer visiting it has unsaved changes.
759 760
760@vindex create-lockfiles 761@vindex create-lockfiles