[Emacs-diffs] trunk r116875: Doc tweaks related to file locking

[Glenn Morris]

------------------------------------------------------------
revno: 116875
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2014-03-25 21:24:01 -0400
message:
  Doc tweaks related to file locking
  
  * doc/lispref/files.texi (File Locks): All systems support locking.
  
  * src/filelock.c (Flock_buffer): Doc tweak.
modified:
  doc/lispref/ChangeLog          changelog-20091113204419-o5vbwnq5f7feedwu-6155
  doc/lispref/files.texi         files.texi-20091113204419-o5vbwnq5f7feedwu-6179
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/filelock.c                 filelock.c-20091113204419-o5vbwnq5f7feedwu-179

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2014-03-22 22:36:29 +0000
+++ b/doc/lispref/ChangeLog     2014-03-26 01:24:01 +0000
@@ -1,3 +1,7 @@
+2014-03-26  Glenn Morris  <address@hidden>
+
+       * files.texi (File Locks): All systems support locking.
+
 2014-03-22  Glenn Morris  <address@hidden>
 
        * commands.texi (Defining Commands):

=== modified file 'doc/lispref/files.texi'
--- a/doc/lispref/files.texi    2014-03-18 01:19:03 +0000
+++ b/doc/lispref/files.texi    2014-03-26 01:24:01 +0000
@@ -709,15 +709,15 @@
 This function locks the file @var{filename}, if the current buffer is
 modified.  The argument @var{filename} defaults to the current buffer's
 visited file.  Nothing is done if the current buffer is not visiting a
-file, or is not modified, or if the system does not support locking.
+file, or is not modified, or if the option @code{create-lockfiles} is
address@hidden
 @end defun
 
 @defun unlock-buffer
 This function unlocks the file being visited in the current buffer,
 if the buffer is modified.  If the buffer is not modified, then
 the file should not be locked, so this function does nothing.  It also
-does nothing if the current buffer is not visiting a file, or if the
-system does not support locking.
+does nothing if the current buffer is not visiting a file, or is not locked.
 @end defun
 
 @defopt create-lockfiles

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-03-26 01:14:44 +0000
+++ b/src/ChangeLog     2014-03-26 01:24:01 +0000
@@ -1,5 +1,7 @@
 2014-03-26  Glenn Morris  <address@hidden>
 
+       * 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):

=== modified file 'src/filelock.c'
--- a/src/filelock.c    2014-03-26 01:14:44 +0000
+++ b/src/filelock.c    2014-03-26 01:24:01 +0000
@@ -771,7 +771,9 @@
        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))