diff options
| author | Juri Linkov <juri@jurta.org> | 2014-07-03 02:45:12 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2014-07-03 02:45:12 +0300 |
| commit | cbb6a7aeff3b901645ee8e4f2c4abeceafdfc073 (patch) | |
| tree | d7a19fbbf00f73b080b4d2e5aab2ddfce8fe0500 /lisp/desktop.el | |
| parent | 4991d13037d4154b3c52d1a2f516714fbcf0e6eb (diff) | |
| download | emacs-cbb6a7aeff3b901645ee8e4f2c4abeceafdfc073.tar.gz | |
* lisp/desktop.el (desktop-save): Rename arg `auto-save' to `only-if-changed'.
Doc fix.
Fixes: debbugs:17873
Diffstat (limited to 'lisp/desktop.el')
| -rw-r--r-- | lisp/desktop.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el index 26d288bf9cd..4bb6fba3532 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -942,12 +942,13 @@ Frames with a non-nil `desktop-dont-save' parameter are not saved." :predicate #'desktop--check-dont-save)))) ;;;###autoload -(defun desktop-save (dirname &optional release auto-save) +(defun desktop-save (dirname &optional release only-if-changed) "Save the desktop in a desktop file. Parameter DIRNAME specifies where to save the desktop file. Optional parameter RELEASE says whether we're done with this desktop. -If AUTO-SAVE is non-nil, compare the saved contents to the one last saved, -and don't save the buffer if they are the same." +If ONLY-IF-CHANGED is non-nil, compare the current desktop information +to that in the desktop file, and if the desktop information has not +changed since it was last saved then do not rewrite the file." (interactive (list ;; Or should we just use (car desktop-path)? (let ((default (if (member "." desktop-path) @@ -1020,7 +1021,7 @@ and don't save the buffer if they are the same." (setq default-directory desktop-dirname) ;; When auto-saving, avoid writing if nothing has changed since the last write. - (let* ((beg (and auto-save + (let* ((beg (and only-if-changed (save-excursion (goto-char (point-min)) ;; Don't check the header with changing timestamp |