[Emacs-diffs] /srv/bzr/emacs/trunk r108179: Add the option to not create lockfiles

[Glenn Morris]

------------------------------------------------------------
revno: 108179
fixes bug(s): http://debbugs.gnu.org/11227
author: Dave Abrahams <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-05-09 20:55:57 -0400
message:
  Add the option to not create lockfiles
  
  * src/filelock.c (syms_of_filelock): New boolean create-lockfiles.
  (lock_file): If create_lockfiles is 0, do nothing.
  
  * lisp/cus-start.el (create-lockfiles): Add it.
modified:
  lisp/ChangeLog
  lisp/cus-start.el
  src/ChangeLog
  src/filelock.c

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-09 12:39:40 +0000
+++ b/lisp/ChangeLog    2012-05-10 00:55:57 +0000
@@ -1,3 +1,7 @@
+2012-05-10  Dave Abrahams  <address@hidden>
+
+       * cus-start.el (create-lockfiles): Add it.
+
 2012-05-09  Chong Yidong  <address@hidden>
 
        * net/browse-url.el (browse-url-url-encode-chars): Use upper-case.

=== modified file 'lisp/cus-start.el'
--- a/lisp/cus-start.el 2012-05-02 13:00:29 +0000
+++ b/lisp/cus-start.el 2012-05-10 00:55:57 +0000
@@ -204,6 +204,7 @@
             (delete-by-moving-to-trash auto-save boolean "23.1")
             (auto-save-visited-file-name auto-save boolean)
             ;; filelock.c
+            (create-lockfiles files boolean "24.2")
             (temporary-file-directory
              ;; Darwin section added 24.1, does not seem worth :version bump.
              files directory nil

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-05-09 21:13:43 +0000
+++ b/src/ChangeLog     2012-05-10 00:55:57 +0000
@@ -1,3 +1,8 @@
+2012-05-10  Dave Abrahams  <address@hidden>
+
+       * filelock.c (syms_of_filelock): New boolean create-lockfiles.
+       (lock_file): If create_lockfiles is 0, do nothing.  (Bug#11227)
+
 2012-05-09  Michael Albinus  <address@hidden>
 
        * dbusbind.c (xd_registered_buses): New internal Lisp object.

=== modified file 'src/filelock.c'
--- a/src/filelock.c    2012-01-19 07:21:25 +0000
+++ b/src/filelock.c    2012-05-10 00:55:57 +0000
@@ -550,6 +550,10 @@
   struct gcpro gcpro1;
   USE_SAFE_ALLOCA;
 
+  /* Don't do locking if the user has opted out.  */
+  if (! create_lockfiles)
+    return;
+
   /* Don't do locking while dumping Emacs.
      Uncompressing wtmp files uses call-process, which does not work
      in an uninitialized Emacs.  */
@@ -722,6 +726,10 @@
               doc: /* The directory for writing temporary files.  */);
   Vtemporary_file_directory = Qnil;
 
+  DEFVAR_BOOL ("create-lockfiles", create_lockfiles,
+              doc: /* Non-nil means use lockfiles to avoid editing collisions. 
 */);
+  create_lockfiles = 1;
+
 #ifdef CLASH_DETECTION
   defsubr (&Sunlock_buffer);
   defsubr (&Slock_buffer);