[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog buffer.c
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs/src ChangeLog buffer.c |
Date: |
Tue, 10 Mar 2009 03:35:29 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 09/03/10 03:35:28
Modified files:
src : ChangeLog buffer.c
Log message:
(Fswitch_to_buffer): Revert part of 2008-10-21's change.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7411&r2=1.7412
http://cvs.savannah.gnu.org/viewcvs/emacs/src/buffer.c?cvsroot=emacs&r1=1.579&r2=1.580
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7411
retrieving revision 1.7412
diff -u -b -r1.7411 -r1.7412
--- ChangeLog 10 Mar 2009 01:05:31 -0000 1.7411
+++ ChangeLog 10 Mar 2009 03:35:27 -0000 1.7412
@@ -1,3 +1,7 @@
+2009-03-10 Stefan Monnier <address@hidden>
+
+ * buffer.c (Fswitch_to_buffer): Revert part of 2008-10-21's change.
+
2009-03-10 Chong Yidong <address@hidden>
* lread.c (Feval_buffer): Doc fix.
Index: buffer.c
===================================================================
RCS file: /sources/emacs/emacs/src/buffer.c,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -b -r1.579 -r1.580
--- buffer.c 8 Jan 2009 03:15:25 -0000 1.579
+++ buffer.c 10 Mar 2009 03:35:28 -0000 1.580
@@ -1800,9 +1800,11 @@
record_buffer (buffer_or_name);
return Fset_buffer (buffer_or_name);
}
-
- if (EQ (minibuf_window, selected_window)
- || !NILP (Fwindow_dedicated_p (selected_window)))
+ else if (EQ (minibuf_window, selected_window)
+ /* If `dedicated' is neither nil nor t, it means it's
+ dedicatedness can be overridden by an explicit request
+ such as a call to switch-to-buffer. */
+ || EQ (Fwindow_dedicated_p (selected_window), Qt))
/* We can't use the selected window so let `pop-to-buffer' try some
other window. */
return call3 (intern ("pop-to-buffer"), buffer_or_name, Qnil, norecord);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src ChangeLog buffer.c,
Stefan Monnier <=