aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2011-06-22 11:23:31 +0200
committerMartin Rudalics2011-06-22 11:23:31 +0200
commit130e3e112121f9f27514ddd4fee6d11fb0fed0b3 (patch)
treea4a267d02341ef6a5b9a2440ae3addedb22395cb
parent396f7c9d288de829438b3d72c5ffb7ceb3bfa655 (diff)
downloademacs-130e3e112121f9f27514ddd4fee6d11fb0fed0b3.tar.gz
emacs-130e3e112121f9f27514ddd4fee6d11fb0fed0b3.zip
Normalize SIDE argument of split-window (Bug#8916).
* window.el (split-window): Normalize SIDE argument (Bug#8916).
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/window.el6
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e5c2e2ad628..0c72fbf47db 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,6 +8,7 @@
8 * window.el (display-buffer-default-specifiers) 8 * window.el (display-buffer-default-specifiers)
9 (display-buffer-alist): Remove entries for pop-up-frame-alist. 9 (display-buffer-alist): Remove entries for pop-up-frame-alist.
10 Suggested by Katsumi Yamaoka <yamaoka@jpl.org>. 10 Suggested by Katsumi Yamaoka <yamaoka@jpl.org>.
11 (split-window): Normalize SIDE argument (Bug#8916).
11 12
12 * frame.el (pop-up-frame-alist, pop-up-frame-function) 13 * frame.el (pop-up-frame-alist, pop-up-frame-function)
13 (special-display-frame-alist, special-display-popup-frame): 14 (special-display-frame-alist, special-display-popup-frame):
diff --git a/lisp/window.el b/lisp/window.el
index 1c347c70067..ac43fe7703c 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3014,7 +3014,11 @@ new window are inherited from the window selected on WINDOW's
3014frame. The selected window is not changed by this function." 3014frame. The selected window is not changed by this function."
3015 (interactive "i") 3015 (interactive "i")
3016 (setq window (normalize-any-window window)) 3016 (setq window (normalize-any-window window))
3017 (let* ((horizontal (not (memq side '(nil below above)))) 3017 (let* ((side (cond
3018 ((not side) 'below)
3019 ((memq side '(below above right left)) side)
3020 (t 'right)))
3021 (horizontal (not (memq side '(nil below above))))
3018 (frame (window-frame window)) 3022 (frame (window-frame window))
3019 (parent (window-parent window)) 3023 (parent (window-parent window))
3020 (function (window-parameter window 'split-window)) 3024 (function (window-parameter window 'split-window))