procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug#12731 in mouse-drag-line.

Browse source 
* mouse.el (mouse-drag-line): Move last form into preceding when
clause (Bug#12731).

* help.el (resize-temp-buffer-window): Fix doc-string.
This commit is contained in:
Martin Rudalics 2012-10-26 11:11:24 +02:00
parent b75897ba63
commit 8c7727c335
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2012-10-26 Martin Rudalics <rudalics@gmx.at>
* mouse.el (mouse-drag-line): Move last form into preceding when
clause (Bug#12731).
* help.el (resize-temp-buffer-window): Fix doc-string.
2012-10-25 David Engster <deng@randomsample.de>
* emacs-lisp/eieio.el (eieio-update-lisp-imenu-expression):

7
lisp/help.el
View file

@ -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)))

4
lisp/mouse.el
View file

@ -517,8 +517,8 @@ must be one of the symbols `header', `mode', or `vertical'."
;; If mouse-2 has never been done by the user, it doesn't have
;; the necessary property to be interpreted correctly.
(put 'mouse-2 'event-kind 'mouse-click)
(setcar event 'mouse-2))
(push event unread-command-events)))
(setcar event 'mouse-2)
(push event unread-command-events))))
(defun mouse-drag-mode-line (start-event)
"Change the height of a window by dragging on the mode line."