diff options
| author | Glenn Morris <[email protected]> | 2012-05-09 20:58:16 -0400 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2012-05-09 20:58:16 -0400 |
| commit | dc0f75c82c55b14e29878c622fc9d2f18cf7a3dd (patch) | |
| tree | 0f3f513cd4454e305349c5aea19e6acdc9984e76 /doc | |
| parent | 836d29b3704d0dc40411715fc0a9f3a708a8f8ad (diff) | |
Document new create-lockfiles option
Diffstat (limited to 'doc')
| -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 |
4 files changed, 19 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 80d9381ec4..95db719405 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2012-05-10 Glenn Morris <[email protected]> + + * files.texi (Interlocking): Mention create-lockfiles option. + 2012-05-09 Chong Yidong <[email protected]> * frames.texi (Mouse References, Mouse Commands): Fix index diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 31883a1f5c..088c3ce29a 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 1b9fa0991e..2967e64455 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2012-05-10 Glenn Morris <[email protected]> + + * files.texi (File Locks): Mention create-lockfiles option. + 2012-05-09 Glenn Morris <[email protected]> * vol1.texi, vol2.texi: Remove files. diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 1756e56bd2..2ee80504b6 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 |