* window.el (display-buffer-function, special-display-p)

(special-display-buffer-names, special-display-regexps)
(special-display-function, same-window-p, same-window-buffer-names)
(same-window-regexps, pop-up-frames, display-buffer-reuse-frames)
(pop-up-frame-function, pop-up-windows)
(split-window-preferred-function, split-height-threshold)
(split-width-threshold, window--splittable-p)
(window--try-to-split-window, window--frame-usable-p)
(even-window-heights, window--even-window-heights)
(window--display-buffer-1, window--display-buffer-2, display-buffer)
(pop-to-buffer): Move from window.c and buffer.c.
(split-window-preferred-horizontally): Remove.
* cus-start.el: Remove corresponding declarations.

* window.c (pop_up_windows, pop_up_frames)
(display_buffer_reuse_frames, Vpop_up_frame_function)
(Vdisplay_buffer_function, Veven_window_heights)
(Vspecial_display_buffer_names, Vspecial_display_regexps)
(Vspecial_display_function, Vsame_window_buffer_names)
(Vsame_window_regexps, split_height_threshold)
(Vsplit_window_preferred_function): Move those vars to window.el.
(display_buffer_1, Fspecial_display_p, Fsame_window_p)
(Fdisplay_buffer): Move those functions to window.el.
(syms_of_window): Remove corresponding declarations.
(display_buffer): New function.
(temp_output_buffer_show, Fother_window_for_scrolling): Use it.
* dispnew.c (Flast_nonminibuf_frame): New function.
* buffer.c (Fpop_to_buffer): Move to window.el.

1 files changed, 0 insertions, 45 deletions

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index e9988700f79..582a3f98c6e 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -302,51 +302,7 @@ since it could result in memory overflow and make Emacs crash."
 			       "22.1")
 	     ;; window.c
 	     (temp-buffer-show-function windows (choice (const nil) function))
-	     (display-buffer-function windows (choice (const nil) function))
-	     (pop-up-frames frames boolean)
-	     (pop-up-frame-function frames function)
-	     (special-display-buffer-names
-	      frames
-	      (repeat (choice :tag "Buffer"
-			      :value ""
-			      (string :format "%v")
-			      (cons :tag "With attributes"
-				    :format "%v"
-				    :value ("" . nil)
-				    (string :format "%v")
-				    (repeat :tag "Attributes"
-					    (cons :format "%v"
-						  (symbol :tag "Parameter")
-						  (sexp :tag "Value")))))))
-	     (special-display-regexps
-	      frames
-	      (repeat (choice :tag "Buffer"
-			      :value ""
-			      (regexp :format "%v")
-			      (cons :tag "With attributes"
-				    :format "%v"
-				    :value ("" . nil)
-				    (regexp :format "%v")
-				    (repeat :tag "Attributes"
-					    (cons :format "%v"
-						  (symbol :tag "Parameter")
-						  (sexp :tag "Value")))))))
-	     (special-display-function frames function)
-	     (same-window-buffer-names windows (repeat (string :format "%v")))
-	     (same-window-regexps windows (repeat (regexp :format "%v")))
-	     (pop-up-windows windows boolean)
-	     (even-window-heights windows boolean)
 	     (next-screen-context-lines windows integer)
-	     (split-height-threshold windows integer)
-             (split-window-preferred-function
-              windows
-              (choice (const :tag "vertically" nil)
-                      ;; FIXME: Add `sensibly' which chooses between
-                      ;; vertical or horizontal splits depending on the size
-                      ;; and shape of the window.
-                      (const :tag "horizontally"
-                             split-window-preferred-horizontally))
-	      "23.1")
 	     (window-min-height windows integer)
 	     (window-min-width windows integer)
  	     (scroll-preserve-screen-position
@@ -354,7 +310,6 @@ since it could result in memory overflow and make Emacs crash."
  		       (const :tag "Off (nil)" :value nil)
  		       (const :tag "Full screen (t)" :value t)
  		       (other :tag "Always" 1)) "22.1")
-	     (display-buffer-reuse-frames windows boolean "21.1")
 	     ;; xdisp.c
 	     (scroll-step windows integer)
 	     (scroll-conservatively windows integer)