[Emacs-diffs] /srv/bzr/emacs/trunk r110673: Fix bug#12731 in mouse-drag-line.

[martin rudalics]

------------------------------------------------------------
revno: 110673
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Fri 2012-10-26 11:11:24 +0200
message:
  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.
modified:
  lisp/ChangeLog
  lisp/help.el
  lisp/mouse.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-25 20:13:16 +0000
+++ b/lisp/ChangeLog    2012-10-26 09:11:24 +0000
@@ -1,3 +1,10 @@
+2012-10-26  Martin Rudalics  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs-lisp/eieio.el (eieio-update-lisp-imenu-expression):

=== modified file 'lisp/help.el'
--- a/lisp/help.el      2012-09-30 09:10:59 +0000
+++ b/lisp/help.el      2012-10-26 09:11:24 +0000
@@ -1012,8 +1012,8 @@
 
 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 @@
                    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)))

=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el     2012-10-07 22:31:58 +0000
+++ b/lisp/mouse.el     2012-10-26 09:11:24 +0000
@@ -517,8 +517,8 @@
       ;; 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."