diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2012-10-26 11:11:24 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2012-10-26 11:11:24 +0200 |
| commit | 8c7727c3354291d0798b2eb031f42a32c618c391 (patch) | |
| tree | 56bd43d952d5aac0beb8fe2c86f72acd87660614 /lisp/help.el | |
| parent | b75897ba631b8dbbb337bd378689b4d35f25b853 (diff) | |
Fix bug#12731 in mouse-drag-line.
* mouse.el (mouse-drag-line): Move last form into preceding when
clause (Bug#12731).
* help.el (resize-temp-buffer-window): Fix doc-string.
Diffstat (limited to 'lisp/help.el')
| -rw-r--r-- | lisp/help.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/help.el b/lisp/help.el index 0df9c607f69..449818207b3 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -1012,8 +1012,8 @@ WINDOW can be any live window and defaults to the selected one. Do not make WINDOW higher than `temp-buffer-max-height' nor smaller than `window-min-height'. Do nothing if WINDOW is not -vertically combined or some of its contents are scrolled out of -view." +vertically combined, some of its contents are scrolled out of +view, or WINDOW was not created by `display-buffer'." (setq window (window-normalize-window window t)) (let ((buffer-name (buffer-name (window-buffer window)))) (let ((height (if (functionp temp-buffer-max-height) @@ -1022,11 +1022,12 @@ view." temp-buffer-max-height)) (quit-cadr (cadr (window-parameter window 'quit-restore)))) (cond - ;; Don't resize WINDOW if it showed another buffer before. + ;; Resize WINDOW iff it was split off by `display-buffer'. ((and (eq quit-cadr 'window) (pos-visible-in-window-p (point-min) window) (window-combined-p window)) (fit-window-to-buffer window height)) + ;; Resize FRAME iff it was created by `display-buffer'. ((and fit-frame-to-buffer (eq quit-cadr 'frame) (eq window (frame-root-window window))) |