andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lisp/gnus/gnus-start.el: always check newsrc timestamp when saving it

Browse source
This commit is contained in:
Ted Zlatanov 2015-02-05 11:51:07 +00:00 • committed by Katsumi Yamaoka
parent ca25231a26
commit ff7072d531
2 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/gnus/ChangeLog
View file

@ -1,3 +1,9 @@
2015-02-05 Teodor Zlatanov <tzz@lifelogs.com>
* 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 <timo.lilja@iki.fi> (tiny change)
* mail-source.el (mail-source-call-script): If scripts exit with an

34
lisp/gnus/gnus-start.el
View file

@ -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,19 +2824,18 @@ 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
(time-less-p gnus-save-newsrc-file-last-timestamp
mtime))
(unless (y-or-n-p
(format "%s was updated externally after %s, save?"
checkfile
(format-time-string
"%c"
gnus-save-newsrc-file-last-timestamp)))
(error "Couldn't save %s: updated externally" checkfile)))))
(let* ((checkfile (concat gnus-current-startup-file ".eld"))
(mtime (nth 5 (file-attributes checkfile))))
(when (and gnus-save-newsrc-file-last-timestamp
(time-less-p gnus-save-newsrc-file-last-timestamp
mtime))
(unless (y-or-n-p
(format "%s was updated externally after %s, save?"
checkfile
(format-time-string
"%c"
gnus-save-newsrc-file-last-timestamp)))
(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)