[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp files.el ChangeLog
From: |
Karl Fogel |
Subject: |
[Emacs-diffs] emacs/lisp files.el ChangeLog |
Date: |
Sat, 05 Sep 2009 15:16:53 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Karl Fogel <kfogel> 09/09/05 15:16:53
Modified files:
lisp : files.el ChangeLog
Log message:
* lisp/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.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1076&r2=1.1077
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16098&r2=1.16099
Patches:
Index: files.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/files.el,v
retrieving revision 1.1076
retrieving revision 1.1077
diff -u -b -r1.1076 -r1.1077
--- files.el 4 Sep 2009 03:18:11 -0000 1.1076
+++ files.el 5 Sep 2009 15:16:49 -0000 1.1077
@@ -1481,12 +1481,12 @@
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? "
+ (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"))
- (save-buffer)))
+ (error "Aborted"))))
(let ((obuf (current-buffer))
(ofile buffer-file-name)
(onum buffer-file-number)
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16098
retrieving revision 1.16099
diff -u -b -r1.16098 -r1.16099
--- ChangeLog 5 Sep 2009 00:57:33 -0000 1.16098
+++ ChangeLog 5 Sep 2009 15:16:50 -0000 1.16099
@@ -1,3 +1,12 @@
+2009-09-05 Karl Fogel <address@hidden>
+
+ * 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 <address@hidden>
* net/tramp.el (tramp-handle-insert-directory): Handle "--dired"
- [Emacs-diffs] emacs/lisp files.el ChangeLog,
Karl Fogel <=