procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/files.el (find-alternate-file): If the old buffer is modified

Browse source 
and visiting a file, behave similarly to `kill-buffer' when killing
  it, thus reverting to the pre-1.878 behavior; see
  http://lists.gnu.org/archive/html/emacs-devel/2009-09/msg00101.html
  for discussion.  Also, consult `buffer-file-name' as a variable not
  as a function, for consistency with the rest of the code.
This commit is contained in:
Karl Fogel 2009-09-05 15:16:49 +00:00
parent 21ee034d12
commit ef7ef2a016
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/ChangeLog
View file

@ -1,3 +1,12 @@
2009-09-05 Karl Fogel <kfogel@red-bean.com>
* files.el (find-alternate-file): If the old buffer is modified
and visiting a file, behave similarly to `kill-buffer' when
killing it, thus reverting to the pre-1.878 behavior; see
http://lists.gnu.org/archive/html/emacs-devel/2009-09/msg00101.html
for discussion. Also, consult `buffer-file-name' as a variable
not as a function, for consistency with the rest of the code.
2009-09-04 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-handle-insert-directory): Handle "--dired"

12
lisp/files.el
View file

@ -1481,12 +1481,12 @@ killed."
t)))
(unless (run-hook-with-args-until-failure 'kill-buffer-query-functions)
(error "Aborted"))
(when (and (buffer-modified-p) (buffer-file-name))
(if (yes-or-no-p (format "Buffer %s is modified; kill anyway? "
(buffer-name)))
(unless (yes-or-no-p "Kill and replace the buffer without saving it? ")
(error "Aborted"))
(save-buffer)))
(when (and (buffer-modified-p) buffer-file-name)
(if (yes-or-no-p (format "Buffer %s is modified; save it first? "
(buffer-name)))
(save-buffer)
(unless (yes-or-no-p "Kill and replace the buffer without saving it? ")
(error "Aborted"))))
(let ((obuf (current-buffer))
(ofile buffer-file-name)
(onum buffer-file-number)