diff options
| author | Joakim Verona <joakim@verona.se> | 2015-02-08 21:55:28 +0100 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2015-02-08 21:55:28 +0100 |
| commit | 5e1d5ef39ca0d2fbff26d659f2ec6ce863b14529 (patch) | |
| tree | 860e0d53399626aee6249ebb5f972879f403b228 /lisp/gnus/gnus-start.el | |
| parent | 148262ce3db990ed16989341345e232570b3a338 (diff) | |
| parent | 7d631aa0ffab875e4979727f632703ad5b4100a2 (diff) | |
| download | emacs-xwidget.tar.gz | |
merge masterxwidget
Diffstat (limited to 'lisp/gnus/gnus-start.el')
| -rw-r--r-- | lisp/gnus/gnus-start.el | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index aa2568d5559..0c0246a4e14 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/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,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) |