diff options
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/window.c b/src/window.c index ba1ec2544f8..070cc2397e6 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -62,7 +62,7 @@ static Lisp_Object Qreplace_buffer_in_windows, Qget_mru_window; | |||
| 62 | static Lisp_Object Qwindow_resize_root_window, Qwindow_resize_root_window_vertically; | 62 | static Lisp_Object Qwindow_resize_root_window, Qwindow_resize_root_window_vertically; |
| 63 | static Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command; | 63 | static Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command; |
| 64 | static Lisp_Object Qsafe, Qabove, Qbelow; | 64 | static Lisp_Object Qsafe, Qabove, Qbelow; |
| 65 | static Lisp_Object Qauto_buffer_name, Qclone_of; | 65 | static Lisp_Object Qclone_of; |
| 66 | 66 | ||
| 67 | static int displayed_window_lines (struct window *); | 67 | static int displayed_window_lines (struct window *); |
| 68 | static int count_windows (struct window *); | 68 | static int count_windows (struct window *); |
| @@ -5540,7 +5540,6 @@ the return value is nil. Otherwise the value is t. */) | |||
| 5540 | struct Lisp_Vector *saved_windows; | 5540 | struct Lisp_Vector *saved_windows; |
| 5541 | Lisp_Object new_current_buffer; | 5541 | Lisp_Object new_current_buffer; |
| 5542 | Lisp_Object frame; | 5542 | Lisp_Object frame; |
| 5543 | Lisp_Object auto_buffer_name; | ||
| 5544 | FRAME_PTR f; | 5543 | FRAME_PTR f; |
| 5545 | ptrdiff_t old_point = -1; | 5544 | ptrdiff_t old_point = -1; |
| 5546 | 5545 | ||
| @@ -5794,18 +5793,6 @@ the return value is nil. Otherwise the value is t. */) | |||
| 5794 | BUF_PT_BYTE (XBUFFER (w->buffer))); | 5793 | BUF_PT_BYTE (XBUFFER (w->buffer))); |
| 5795 | w->start_at_line_beg = 1; | 5794 | w->start_at_line_beg = 1; |
| 5796 | } | 5795 | } |
| 5797 | else if (STRINGP (auto_buffer_name = | ||
| 5798 | Fwindow_parameter (window, Qauto_buffer_name)) | ||
| 5799 | && SCHARS (auto_buffer_name) != 0 | ||
| 5800 | && (wset_buffer (w, Fget_buffer_create (auto_buffer_name)), | ||
| 5801 | !NILP (w->buffer))) | ||
| 5802 | { | ||
| 5803 | set_marker_restricted (w->start, | ||
| 5804 | make_number (0), w->buffer); | ||
| 5805 | set_marker_restricted (w->pointm, | ||
| 5806 | make_number (0), w->buffer); | ||
| 5807 | w->start_at_line_beg = 1; | ||
| 5808 | } | ||
| 5809 | else | 5796 | else |
| 5810 | /* Window has no live buffer, get one. */ | 5797 | /* Window has no live buffer, get one. */ |
| 5811 | { | 5798 | { |
| @@ -6711,7 +6698,6 @@ syms_of_window (void) | |||
| 6711 | DEFSYM (Qtemp_buffer_show_hook, "temp-buffer-show-hook"); | 6698 | DEFSYM (Qtemp_buffer_show_hook, "temp-buffer-show-hook"); |
| 6712 | DEFSYM (Qabove, "above"); | 6699 | DEFSYM (Qabove, "above"); |
| 6713 | DEFSYM (Qbelow, "below"); | 6700 | DEFSYM (Qbelow, "below"); |
| 6714 | DEFSYM (Qauto_buffer_name, "auto-buffer-name"); | ||
| 6715 | DEFSYM (Qclone_of, "clone-of"); | 6701 | DEFSYM (Qclone_of, "clone-of"); |
| 6716 | 6702 | ||
| 6717 | staticpro (&Vwindow_list); | 6703 | staticpro (&Vwindow_list); |