aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorMartin Rudalics2008-10-10 15:07:28 +0000
committerMartin Rudalics2008-10-10 15:07:28 +0000
commite6001b58231de00b00e19f9e11d3cf2290ab0138 (patch)
treee838b0fde4423eb094e8beb8b8f64fe8b474ab32 /lisp
parente6c1b5fb51af886d35bf0fe9a1b5c6e601655e23 (diff)
downloademacs-e6001b58231de00b00e19f9e11d3cf2290ab0138.tar.gz
emacs-e6001b58231de00b00e19f9e11d3cf2290ab0138.zip
(pop-to-buffer): Fix misplacement of arg norecord in
call of select-window.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/window.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index db1c1b01d3d..edddb877e72 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-10-10 Martin Rudalics <rudalics@gmx.at>
2
3 * window.el (pop-to-buffer): Fix misplacement of arg norecord in
4 call of select-window.
5
12008-10-10 Jay Belanger <jay.p.belanger@gmail.com> 62008-10-10 Jay Belanger <jay.p.belanger@gmail.com>
2 7
3 * calc/calc.el (calc-embedded-word-regexp) 8 * calc/calc.el (calc-embedded-word-regexp)
diff --git a/lisp/window.el b/lisp/window.el
index e69634de68c..46f847f8686 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1063,10 +1063,10 @@ at the front of the list of recently selected ones."
1063 (old-frame (selected-frame)) 1063 (old-frame (selected-frame))
1064 new-window new-frame) 1064 new-window new-frame)
1065 (set-buffer buffer) 1065 (set-buffer buffer)
1066 (setq new-window (display-buffer buffer other-window) norecord) 1066 (setq new-window (display-buffer buffer other-window))
1067 (unless (eq new-window old-window) 1067 (unless (eq new-window old-window)
1068 ;; `display-buffer' has chosen another window, select it. 1068 ;; `display-buffer' has chosen another window, select it.
1069 (select-window new-window) 1069 (select-window new-window norecord)
1070 (setq new-frame (window-frame new-window)) 1070 (setq new-frame (window-frame new-window))
1071 (unless (eq new-frame old-frame) 1071 (unless (eq new-frame old-frame)
1072 ;; `display-buffer' has chosen another frame, make sure it gets 1072 ;; `display-buffer' has chosen another frame, make sure it gets