[gnus git] branch master updated: m0-11-149-g1c4e3c3 =1= gnus-start.el: always check newsrc timestamp when saving it.

       via  1c4e3c3a0fa8a01ce010dcaad75b26b0e0f8e3e2 (commit)
      from  3b332f4bc8531cc13428f4e3778b1e3f53a852f4 (commit)


- Log -----------------------------------------------------------------
commit 1c4e3c3a0fa8a01ce010dcaad75b26b0e0f8e3e2
Author: Ted Zlatanov <[email protected]>
Date:   Thu Feb 5 05:58:12 2015 -0500

    gnus-start.el: always check newsrc timestamp when saving it.
    
    * gnus-start.el (gnus-save-newsrc-file-check-timestamp): Remove
    variable; always check the newrc timestamp.
    (gnus-save-newsrc-file): Always check timestamp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 490d731..33c2f22 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-05  Teodor Zlatanov  <[email protected]>
+
+	* gnus-start.el (gnus-save-newsrc-file-check-timestamp): Remove
+	variable; always check the newrc timestamp.
+	(gnus-save-newsrc-file): Always check timestamp.
+
 2015-02-05  Timo Lilja  <[email protected]>  (tiny change)
 
 	* mail-source.el (mail-source-call-script): If scripts exit with an
diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index aa2568d..0c0246a 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -442,15 +442,6 @@ See also `gnus-before-startup-hook'."
   :group 'gnus-newsrc
   :type 'hook)
 
-(defcustom gnus-save-newsrc-file-check-timestamp nil
-  "Check the modification time of the newsrc.eld file before saving it.
-When the newsrc.eld file is updated by multiple machines,
-checking the file's modification time is a good way to avoid
-overwriting updated data."
-  :version "25.1"
-  :group 'gnus-newsrc
-  :type 'boolean)
-
 (defcustom gnus-save-newsrc-hook nil
   "A hook called before saving any of the newsrc files."
   :group 'gnus-newsrc
@@ -2833,7 +2824,6 @@ If FORCE is non-nil, the .newsrc file is read."
 
           ;; check timestamp of `gnus-current-startup-file'.eld against
           ;; `gnus-save-newsrc-file-last-timestamp'
-          (when gnus-save-newsrc-file-check-timestamp
           (let* ((checkfile (concat gnus-current-startup-file ".eld"))
                  (mtime (nth 5 (file-attributes checkfile))))
             (when (and gnus-save-newsrc-file-last-timestamp
@@ -2845,7 +2835,7 @@ If FORCE is non-nil, the .newsrc file is read."
                                (format-time-string
                                 "%c"
                                 gnus-save-newsrc-file-last-timestamp)))
-                (error "Couldn't save %s: updated externally" checkfile)))))
+                (error "Couldn't save %s: updated externally" checkfile))))
 
           (if gnus-save-startup-file-via-temp-buffer
               (let ((coding-system-for-write gnus-ding-file-coding-system)

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog     |    6 ++++++
 lisp/gnus-start.el |   34 ++++++++++++----------------------
 2 files changed, 18 insertions(+), 22 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project