diff options
| author | Martin Rudalics | 2014-03-06 14:41:58 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2014-03-06 14:41:58 +0100 |
| commit | cac0a1d67e6bfec0ba08e1999b91212a7a561120 (patch) | |
| tree | 4c04ba03dbd31dc8e8d6f308ef9c04462e6e0f58 /src | |
| parent | fa965cbf7420c7ee5a0dde0df472592cd3aa2a1d (diff) | |
| download | emacs-cac0a1d67e6bfec0ba08e1999b91212a7a561120.tar.gz emacs-cac0a1d67e6bfec0ba08e1999b91212a7a561120.zip | |
More window code related fixes and documentation changes.
* window.c (Fother_window_for_scrolling): Check that
Vother_window_scroll_buffer is a buffer.
* window.el (fit-frame-to-buffer, fit-frame-to-buffer-margins):
Fix doc-strings.
(fit-frame-to-buffer): New argument ONLY. Remove dependency on
fit-frame-to-buffer variable. Fix doc-string.
(fit-window-to-buffer): Set ONLY argument in call of
fit-frame-to-buffer. Fix doc-string.
* frames.texi (Size and Position): Rewrite entries for
`fit-frame-to-buffer' and `fit-frame-to-buffer-margins'. Add
description for `fit-frame-to-buffer-sizes'.
* windows.texi (Resizing Windows): Add descriptions for
pixelwise resizing. Add entries for `window-resize-pixelwise'
and `fit-window-to-buffer-horizontally'. Rewrite
`fit-window-to-buffer' entry.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/window.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8f9d7f555a3..9fef63c9a58 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-03-06 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * window.c (Fother_window_for_scrolling): Check that | ||
| 4 | Vother_window_scroll_buffer is a buffer. | ||
| 5 | |||
| 1 | 2014-03-06 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2014-03-06 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | * xterm.c (xim_initialize): Always pass a copy of resource name | 8 | * xterm.c (xim_initialize): Always pass a copy of resource name |
diff --git a/src/window.c b/src/window.c index b6cfacd9aad..4d8520d7436 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -5431,6 +5431,7 @@ specifies the window. This takes precedence over | |||
| 5431 | window = Vminibuf_scroll_window; | 5431 | window = Vminibuf_scroll_window; |
| 5432 | /* If buffer is specified and live, scroll that buffer. */ | 5432 | /* If buffer is specified and live, scroll that buffer. */ |
| 5433 | else if (!NILP (Vother_window_scroll_buffer) | 5433 | else if (!NILP (Vother_window_scroll_buffer) |
| 5434 | && BUFFERP (Vother_window_scroll_buffer) | ||
| 5434 | && BUFFER_LIVE_P (XBUFFER (Vother_window_scroll_buffer))) | 5435 | && BUFFER_LIVE_P (XBUFFER (Vother_window_scroll_buffer))) |
| 5435 | { | 5436 | { |
| 5436 | window = Fget_buffer_window (Vother_window_scroll_buffer, Qnil); | 5437 | window = Fget_buffer_window (Vother_window_scroll_buffer, Qnil); |