aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorMartin Rudalics2010-06-07 21:28:02 +0300
committerJuri Linkov2010-06-07 21:28:02 +0300
commit13b5221f4df08dd203b36cc444aab7e825dd29f8 (patch)
tree2cd4b4012752a3d6950b22a6b23e8b70858fa6bd /src/window.c
parent5220357f5856b5b917e84bb6f745982df05a9684 (diff)
downloademacs-13b5221f4df08dd203b36cc444aab7e825dd29f8.tar.gz
emacs-13b5221f4df08dd203b36cc444aab7e825dd29f8.zip
* window.el (pop-to-buffer): Remove the conditional that
compares new-window and old-window, so it will reselect the selected window unconditionally. http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00078.html * window.c (Fselect_window): Move `record_buffer' up to the beginning of this function, so the buffer gets recorded even if the selected window does not change. http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00137.html
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c
index 882f76d9758..c6ea10ea95b 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3611,6 +3611,7 @@ selected window before each command. */)
3611 { 3611 {
3612 ++window_select_count; 3612 ++window_select_count;
3613 XSETFASTINT (w->use_time, window_select_count); 3613 XSETFASTINT (w->use_time, window_select_count);
3614 record_buffer (w->buffer);
3614 } 3615 }
3615 3616
3616 if (EQ (window, selected_window)) 3617 if (EQ (window, selected_window))
@@ -3646,8 +3647,6 @@ selected window before each command. */)
3646 3647
3647 selected_window = window; 3648 selected_window = window;
3648 3649
3649 if (NILP (norecord))
3650 record_buffer (w->buffer);
3651 Fset_buffer (w->buffer); 3650 Fset_buffer (w->buffer);
3652 3651
3653 XBUFFER (w->buffer)->last_selected_window = window; 3652 XBUFFER (w->buffer)->last_selected_window = window;