summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-03-25 21:24:01 -0400
committerGlenn Morris <rgm@gnu.org>2014-03-25 21:24:01 -0400
commit0b4fe0787b957624ebffa5d123c69d5c0a5d69e2 (patch)
treee7c0c080c938e0f64eeb8e692473f74d3dd913fd /src
parent11ee65afc20d41f1fc31fe2ead84b2203b4bfeb0 (diff)
downloademacs-0b4fe0787b957624ebffa5d123c69d5c0a5d69e2.tar.gz
emacs-0b4fe0787b957624ebffa5d123c69d5c0a5d69e2.tar.bz2
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 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/filelock.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 87c2d364b05..05c5b42ef90 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
2014-03-26 Glenn Morris <rgm@gnu.org>
+ * filelock.c (Flock_buffer): Doc tweak.
+
* buffer.c (Frestore_buffer_modified_p, Fkill_buffer):
* emacs.c (shut_down_emacs):
* fileio.c (Finsert_file_contents, write_region):
diff --git a/src/filelock.c b/src/filelock.c
index cc5c821cadd..f857c488143 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -771,7 +771,9 @@ DEFUN ("lock-buffer", Flock_buffer, Slock_buffer,
0, 1, 0,
doc: /* Lock FILE, if current buffer is modified.
FILE defaults to current buffer's visited file,
-or else nothing is done if current buffer isn't visiting a file. */)
+or else nothing is done if current buffer isn't visiting a file.
+
+If the option `create-lockfiles' is nil, this does nothing. */)
(Lisp_Object file)
{
if (NILP (file))