aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/window.el56
1 files changed, 0 insertions, 56 deletions
diff --git a/lisp/window.el b/lisp/window.el
index a5fdb2618f5..b3ec25e1f67 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -957,59 +957,6 @@ is higher than WINDOW."
957 (enlarge-window (/ (- (window-height window) (window-height)) 2)) 957 (enlarge-window (/ (- (window-height window) (window-height)) 2))
958 (error nil))))) 958 (error nil)))))
959 959
960(defun display-buffer-specially (buffer locus)
961 (cond
962 ((window-minibuffer-p (selected-window))
963 nil)
964 ((eq locus 'this)
965 (condition-case nil
966 (switch-to-buffer buffer)
967 (error nil)))
968 ((memq locus '(below below-split right right-split))
969 (let ((edges (window-edges)))
970 (cond
971 ((and (eq locus 'below)
972 (let* ((other-window (next-window))
973 (other-edges (window-edges other-window)))
974 (and (= (nth 0 edges) (nth 0 other-edges))
975 (< (nth 3 edges) (nth 3 other-edges))
976 other-window))))
977 ((and (eq locus 'right)
978 (let* ((other-window (next-window))
979 (other-edges (window-edges other-window)))
980 (and (= (nth 1 edges) (nth 1 other-edges))
981 (< (nth 2 edges) (nth 2 other-edges))
982 other-window))))
983 ((and (memq locus '(below below-split))
984 (let ((split-height-threshold 0))
985 (and (window--splittable-p (selected-window))
986 (split-window)))))
987 ((and (memq locus '(right right-split))
988 (let ((split-width-threshold 0))
989 (window--splittable-p (selected-window) t)
990 (split-window nil nil t)))))))
991 ((memq locus '(bottom bottom-split))
992 (let ((edges (window-edges))
993 (other-edges (window-edges (next-window)))
994 (window (selected-window))
995 window-to-display window-to-split)
996 ;; Wrong -- our window must be better than the last we found.
997 (while (or (> (nth 2 other-edges) (nth 2 edges))
998 (> (nth 3 other-edges) (nth 3 edges)))
999 (setq window (next-window window))
1000 (when (> (nth 3 other-edges) (nth 3 edges))
1001 (setq window-to-display window)
1002 (setq window-to-split
1003 (and (eq locus 'bottom-split)
1004 (let ((split-height-threshold 0))
1005 (and (window--splittable-p window)
1006 window)))))
1007 (setq other-edges (window-edges (next-window window))))
1008 (if (eq locus 'bottom)
1009 window-to-display
1010 (let ((split-height-threshold 0))
1011 (split-window window-to-split)))))))
1012
1013(defun window--display-buffer-1 (window) 960(defun window--display-buffer-1 (window)
1014 "Raise the frame containing WINDOW. 961 "Raise the frame containing WINDOW.
1015Do not raise the selected frame. Return WINDOW." 962Do not raise the selected frame. Return WINDOW."
@@ -1121,9 +1068,6 @@ consider all visible or iconified frames."
1121 (when pars 1068 (when pars
1122 (funcall special-display-function 1069 (funcall special-display-function
1123 buffer (if (listp pars) pars)))))) 1070 buffer (if (listp pars) pars))))))
1124 ((not (memq not-this-window '(nil t)))
1125 (window--display-buffer-2
1126 buffer (display-buffer-specially buffer not-this-window)))
1127 ((or use-pop-up-frames (not frame-to-use)) 1071 ((or use-pop-up-frames (not frame-to-use))
1128 ;; We want or need a new frame. 1072 ;; We want or need a new frame.
1129 (window--display-buffer-2 1073 (window--display-buffer-2