aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2014-03-25 21:24:01 -0400
committerGlenn Morris2014-03-25 21:24:01 -0400
commit0b4fe0787b957624ebffa5d123c69d5c0a5d69e2 (patch)
treee7c0c080c938e0f64eeb8e692473f74d3dd913fd /doc
parent11ee65afc20d41f1fc31fe2ead84b2203b4bfeb0 (diff)
downloademacs-0b4fe0787b957624ebffa5d123c69d5c0a5d69e2.tar.gz
emacs-0b4fe0787b957624ebffa5d123c69d5c0a5d69e2.zip
Doc tweaks related to file locking
* doc/lispref/files.texi (File Locks): All systems support locking. * src/filelock.c (Flock_buffer): Doc tweak.
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/files.texi6
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 870d2dd5d37..71af1bc66a0 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12014-03-26 Glenn Morris <rgm@gnu.org>
2
3 * files.texi (File Locks): All systems support locking.
4
12014-03-22 Glenn Morris <rgm@gnu.org> 52014-03-22 Glenn Morris <rgm@gnu.org>
2 6
3 * commands.texi (Defining Commands): 7 * commands.texi (Defining Commands):
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 3818c18f57a..a00fa5b4795 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -709,15 +709,15 @@ some other job.
709This function locks the file @var{filename}, if the current buffer is 709This function locks the file @var{filename}, if the current buffer is
710modified. The argument @var{filename} defaults to the current buffer's 710modified. The argument @var{filename} defaults to the current buffer's
711visited file. Nothing is done if the current buffer is not visiting a 711visited file. Nothing is done if the current buffer is not visiting a
712file, or is not modified, or if the system does not support locking. 712file, or is not modified, or if the option @code{create-lockfiles} is
713@code{nil}.
713@end defun 714@end defun
714 715
715@defun unlock-buffer 716@defun unlock-buffer
716This function unlocks the file being visited in the current buffer, 717This function unlocks the file being visited in the current buffer,
717if the buffer is modified. If the buffer is not modified, then 718if the buffer is modified. If the buffer is not modified, then
718the file should not be locked, so this function does nothing. It also 719the file should not be locked, so this function does nothing. It also
719does nothing if the current buffer is not visiting a file, or if the 720does nothing if the current buffer is not visiting a file, or is not locked.
720system does not support locking.
721@end defun 721@end defun
722 722
723@defopt create-lockfiles 723@defopt create-lockfiles