Commit 87478b52 authored by Stefan Monnier's avatar Stefan Monnier

* 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.
parent 9e0e0d77
2008-06-05 Martin Rudalics <rudalics@gmx.at>
* 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.
2008-06-05 Sam Steingold <sds@gnu.org>
* vc.el (vc-update): Use `save-some-buffers' instead of signaling
......
......@@ -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)
......
This diff is collapsed.
2008-06-05 Martin Rudalics <rudalics@gmx.at>
* 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.
2008-06-05 Stefan Monnier <monnier@iro.umontreal.ca>
* data.c (set_internal): Fix up call to let_shadows_buffer_binding_p.
......
......@@ -1811,42 +1811,6 @@ the window-buffer correspondences. */)
return switch_to_buffer_1 (buffer, norecord);
}
DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 3, 0,
doc: /* Select buffer BUFFER in some window, preferably a different one.
BUFFER may be a buffer, a string \(a buffer name), or nil.
If BUFFER is a string which is not the name of an existing buffer,
then this function creates a buffer with that name.
If BUFFER is nil, then it chooses some other buffer.
If `pop-up-windows' is non-nil, windows can be split to do this.
If optional second arg OTHER-WINDOW is non-nil, insist on finding another
window even if BUFFER is already visible in the selected window,
and ignore `same-window-regexps' and `same-window-buffer-names'.
This function returns the buffer it switched to.
This uses the function `display-buffer' as a subroutine; see the documentation
of `display-buffer' for additional customization information.
Optional third arg NORECORD non-nil means
do not put this buffer at the front of the list of recently selected ones. */)
(buffer, other_window, norecord)
Lisp_Object buffer, other_window, norecord;
{
register Lisp_Object buf;
if (NILP (buffer))
buf = Fother_buffer (Fcurrent_buffer (), Qnil, Qnil);
else
{
buf = Fget_buffer (buffer);
if (NILP (buf))
{
buf = Fget_buffer_create (buffer);
Fset_buffer_major_mode (buf);
}
}
Fset_buffer (buf);
Fselect_window (Fdisplay_buffer (buf, other_window, Qnil), norecord);
return buf;
}
DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0,
doc: /* Return the current buffer as a Lisp object. */)
()
......@@ -6269,7 +6233,6 @@ The function `kill-all-local-variables' runs this before doing anything else. *
defsubr (&Skill_buffer);
defsubr (&Sset_buffer_major_mode);
defsubr (&Sswitch_to_buffer);
defsubr (&Spop_to_buffer);
defsubr (&Scurrent_buffer);
defsubr (&Sset_buffer);
defsubr (&Sbarf_if_buffer_read_only);
......
......@@ -7061,6 +7061,17 @@ WINDOW nil or omitted means report on the selected window. */)
return w->cursor_off_p ? Qnil : Qt;
}
DEFUN ("last-nonminibuffer-frame", Flast_nonminibuf_frame,
Slast_nonminibuf_frame, 0, 0, 0,
doc: /* Value is last nonminibuffer frame. */)
()
{
Lisp_Object frame;
XSETFRAME (frame, last_nonminibuf_frame);
return frame;
}
/***********************************************************************
Initialization
......@@ -7079,6 +7090,7 @@ syms_of_display ()
defsubr (&Ssend_string_to_terminal);
defsubr (&Sinternal_show_cursor);
defsubr (&Sinternal_show_cursor_p);
defsubr (&Slast_nonminibuf_frame);
#if GLYPH_DEBUG
defsubr (&Sdump_redisplay_history);
......
......@@ -2865,7 +2865,6 @@ EXFUN (set_buffer_if_live, 1);
EXFUN (Fbarf_if_buffer_read_only, 0);
EXFUN (Fcurrent_buffer, 0);
EXFUN (Fswitch_to_buffer, 2);
EXFUN (Fpop_to_buffer, 3);
EXFUN (Fother_buffer, 3);
EXFUN (Foverlay_get, 2);
EXFUN (Fbuffer_modified_p, 1);
......
This diff is collapsed.
......@@ -760,7 +760,6 @@ extern Lisp_Object Vmouse_event;
EXFUN (Fnext_window, 3);
EXFUN (Fselect_window, 2);
EXFUN (Fdisplay_buffer, 3);
EXFUN (Fset_window_buffer, 3);
EXFUN (Fset_window_hscroll, 2);
EXFUN (Fwindow_hscroll, 1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment