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))