mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-30 12:21:25 -08:00
(save-some-buffers): Fix previous change.
This commit is contained in:
parent
18260534da
commit
5625c2fc22
1 changed files with 44 additions and 42 deletions
|
|
@ -1527,48 +1527,50 @@ Optional second argument EXITING means ask about certain non-file buffers
|
|||
as well as about file buffers."
|
||||
(interactive "P")
|
||||
(save-window-excursion
|
||||
(or (not (zerop (map-y-or-n-p
|
||||
(function
|
||||
(lambda (buffer)
|
||||
(and (buffer-modified-p buffer)
|
||||
(or
|
||||
(buffer-file-name buffer)
|
||||
(and exiting
|
||||
(progn
|
||||
(set-buffer buffer)
|
||||
(and buffer-offer-save (> (buffer-size) 0)))))
|
||||
(if arg
|
||||
t
|
||||
(if (buffer-file-name buffer)
|
||||
(format "Save file %s? "
|
||||
(buffer-file-name buffer))
|
||||
(format "Save buffer %s? "
|
||||
(buffer-name buffer)))))))
|
||||
(function
|
||||
(lambda (buffer)
|
||||
(set-buffer buffer)
|
||||
(save-buffer)))
|
||||
(buffer-list)
|
||||
'("buffer" "buffers" "save")
|
||||
(list (list ?\C-r (lambda (buf)
|
||||
(view-buffer buf)
|
||||
(setq view-exit-action
|
||||
'(lambda (ignore)
|
||||
(exit-recursive-edit)))
|
||||
(recursive-edit)
|
||||
;; Return nil to ask about BUF again.
|
||||
nil)
|
||||
"display the current buffer"))
|
||||
)))
|
||||
(and save-abbrevs abbrevs-changed
|
||||
(progn
|
||||
(if (or arg
|
||||
(y-or-n-p (format "Save abbrevs in %s? " abbrev-file-name)))
|
||||
(write-abbrev-file nil))
|
||||
;; Don't keep bothering user if he says no.
|
||||
(setq abbrevs-changed nil)
|
||||
t))
|
||||
(message "(No files need saving)"))))
|
||||
(let ((files-done
|
||||
(map-y-or-n-p
|
||||
(function
|
||||
(lambda (buffer)
|
||||
(and (buffer-modified-p buffer)
|
||||
(or
|
||||
(buffer-file-name buffer)
|
||||
(and exiting
|
||||
(progn
|
||||
(set-buffer buffer)
|
||||
(and buffer-offer-save (> (buffer-size) 0)))))
|
||||
(if arg
|
||||
t
|
||||
(if (buffer-file-name buffer)
|
||||
(format "Save file %s? "
|
||||
(buffer-file-name buffer))
|
||||
(format "Save buffer %s? "
|
||||
(buffer-name buffer)))))))
|
||||
(function
|
||||
(lambda (buffer)
|
||||
(set-buffer buffer)
|
||||
(save-buffer)))
|
||||
(buffer-list)
|
||||
'("buffer" "buffers" "save")
|
||||
(list (list ?\C-r (lambda (buf)
|
||||
(view-buffer buf)
|
||||
(setq view-exit-action
|
||||
'(lambda (ignore)
|
||||
(exit-recursive-edit)))
|
||||
(recursive-edit)
|
||||
;; Return nil to ask about BUF again.
|
||||
nil)
|
||||
"display the current buffer"))))
|
||||
(abbrevs-done
|
||||
(and save-abbrevs abbrevs-changed
|
||||
(progn
|
||||
(if (or arg
|
||||
(y-or-n-p (format "Save abbrevs in %s? " abbrev-file-name)))
|
||||
(write-abbrev-file nil))
|
||||
;; Don't keep bothering user if he says no.
|
||||
(setq abbrevs-changed nil)
|
||||
t))))
|
||||
(or (> files-done 0) abbrevs-done
|
||||
(message "(No files need saving)")))))
|
||||
|
||||
(defun not-modified (&optional arg)
|
||||
"Mark current buffer as unmodified, not needing to be saved.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue