diff options
| -rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/emacs/files.texi | 5 | ||||
| -rw-r--r-- | doc/lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispref/files.texi | 7 | ||||
| -rw-r--r-- | etc/NEWS | 4 |
5 files changed, 23 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 80d9381ec42..95db7194053 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2012-05-10 Glenn Morris <rgm@gnu.org> + + * files.texi (Interlocking): Mention create-lockfiles option. + 2012-05-09 Chong Yidong <cyd@gnu.org> * frames.texi (Mouse References, Mouse Commands): Fix index diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 31883a1f5cc..088c3ce29a7 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -739,6 +739,11 @@ directory.) Emacs removes the lock when you save the changes. The idea is that the file is locked whenever an Emacs buffer visiting it has unsaved changes. +@vindex create-lockfiles + You can prevent the creation of lock files by setting the variable +@code{create-lockfiles} to @code{nil}. @strong{Caution:} by +doing so you will lose the benefits that this feature provides. + @cindex collision If you begin to modify the buffer while the visited file is locked by someone else, this constitutes a @dfn{collision}. When Emacs detects a diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 1b9fa0991e4..2967e644558 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2012-05-10 Glenn Morris <rgm@gnu.org> + + * files.texi (File Locks): Mention create-lockfiles option. + 2012-05-09 Glenn Morris <rgm@gnu.org> * vol1.texi, vol2.texi: Remove files. diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 1756e56bd2a..2ee80504b60 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -726,7 +726,12 @@ system does not support locking. File locking is not supported on some systems. On systems that do not support it, the functions @code{lock-buffer}, @code{unlock-buffer} and -@code{file-locked-p} do nothing and return @code{nil}. +@code{file-locked-p} do nothing and return @code{nil}. It is also +possible to disable locking, by setting the variable @code{create-lockfiles}. + +@defopt create-lockfiles +If this variable is @code{nil}, Emacs does not lock files. +@end defopt @defun ask-user-about-lock file other-user This function is called when the user tries to modify @var{file}, but it @@ -65,6 +65,10 @@ ImageMagick to view images, set frames, if emacsclient is only told to open a new frame without specifying any file to visit or expression to evaluate. ++++ +** You can prevent the creation of lock files by setting `create-lockfiles' +to nil. Use with caution, and only if you really need to. + ** Using "unibyte: t" in Lisp source files is obsolete. Use "coding: raw-text" instead. |