mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-30 08:09:04 +00:00
Code Issues Releases Activity

Consider Vother_window_scroll_buffer valid iff it's a live buffer.

Browse Source 
* window.c (Fother_window_for_scrolling): Don't try to scroll a
killed Vother_window_scroll_buffer.
(Vother_window_scroll_buffer): Fix doc-string accordingly.
This commit is contained in:
Martin Rudalics 2014-03-01 20:15:29 +01:00
parent cb8b26b4ba
commit 2907acd464
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -1,3 +1,10 @@
2014-03-01 Martin Rudalics <rudalics@gmx.at>
Consider Vother_window_scroll_buffer valid iff it's a live buffer.
* window.c (Fother_window_for_scrolling): Don't try to scroll a
killed Vother_window_scroll_buffer.
(Vother_window_scroll_buffer): Fix doc-string accordingly.
2014-03-01 Eli Zaretskii <eliz@gnu.org> 2014-03-01 Eli Zaretskii <eliz@gnu.org>
* fileio.c (Fexpand_file_name) [WINDOWSNT]: Don't treat file names * fileio.c (Fexpand_file_name) [WINDOWSNT]: Don't treat file names

7
src/window.c
View File

@ -5429,8 +5429,9 @@ specifies the window. This takes precedence over
if (MINI_WINDOW_P (XWINDOW (selected_window)) if (MINI_WINDOW_P (XWINDOW (selected_window))
&& !NILP (Vminibuf_scroll_window)) && !NILP (Vminibuf_scroll_window))
window = Vminibuf_scroll_window; window = Vminibuf_scroll_window;
/* If buffer is specified, scroll that buffer. */ /* If buffer is specified and live, scroll that buffer. */
else if (!NILP (Vother_window_scroll_buffer)) else if (!NILP (Vother_window_scroll_buffer)
&& BUFFER_LIVE_P (XBUFFER (Vother_window_scroll_buffer)))
{ {
window = Fget_buffer_window (Vother_window_scroll_buffer, Qnil); window = Fget_buffer_window (Vother_window_scroll_buffer, Qnil);
if (NILP (window)) if (NILP (window))
@ -7197,7 +7198,7 @@ is displayed in the `mode-line' face. */);
mode_line_in_non_selected_windows = 1; mode_line_in_non_selected_windows = 1;
DEFVAR_LISP ("other-window-scroll-buffer", Vother_window_scroll_buffer, DEFVAR_LISP ("other-window-scroll-buffer", Vother_window_scroll_buffer,
doc: /* If non-nil, this is a buffer and \\[scroll-other-window] should scroll its window. */); doc: /* If this is a live buffer, \\[scroll-other-window] should scroll its window. */);
Vother_window_scroll_buffer = Qnil; Vother_window_scroll_buffer = Qnil;
DEFVAR_BOOL ("auto-window-vscroll", auto_window_vscroll_p, DEFVAR_BOOL ("auto-window-vscroll", auto_window_vscroll_p,