From: Martin Rudalics <rudalics@gmx.at>
Date: Fri, 26 Oct 2012 09:11:24 +0000 (+0200)
Subject: Fix bug#12731 in mouse-drag-line.
X-Git-Tag: emacs-24.2.90~209^2~67
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8c7727c3354291d0798b2eb031f42a32c618c391;p=emacs.git

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.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 188cd9ce941..75fbaa13b92 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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):
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)))
diff --git a/lisp/mouse.el b/lisp/mouse.el
index fa5c69281de..61d70404bd6 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -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."