[Emacs-diffs] trunk r116208: In mouse-drag-line obey window-resize-pixelwise (Bug#16594).

[Martin Rudalics]

------------------------------------------------------------
revno: 116208
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Thu 2014-01-30 14:19:19 +0100
message:
  In mouse-drag-line obey window-resize-pixelwise (Bug#16594).
  
  * mouse.el (mouse-drag-line): When window-resize-pixelwise is
  nil call adjust-window-trailing-edge with suitable arguments
  (Bug#16594).
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/mouse.el                  mouse.el-20091113204419-o5vbwnq5f7feedwu-123

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-30 07:48:06 +0000
+++ b/lisp/ChangeLog    2014-01-30 13:19:19 +0000
@@ -1,3 +1,9 @@
+2014-01-30  Martin Rudalics  <address@hidden>
+
+       * mouse.el (mouse-drag-line): When window-resize-pixelwise is
+       nil call adjust-window-trailing-edge with suitable arguments
+       (Bug#16594).
+
 2014-01-30  Glenn Morris  <address@hidden>
 
        * simple.el (eval-expression): Doc fix.

=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el     2014-01-01 07:43:34 +0000
+++ b/lisp/mouse.el     2014-01-30 13:19:19 +0000
@@ -475,8 +475,11 @@
                          (nth 2 (window-pixel-edges window))
                          -1))
          (unless (zerop growth)
+           (unless window-resize-pixelwise
+             (setq growth (min (/ growth (frame-char-width frame)) 1)))
            (setq dragged t)
-           (adjust-window-trailing-edge window growth t t)))
+           (adjust-window-trailing-edge
+            window growth t window-resize-pixelwise)))
         (draggable
          ;; Drag horizontal divider.
          (setq growth
@@ -487,9 +490,12 @@
                  (- (+ (nth 3 (window-pixel-edges window)) height)
                     (cddr position))))
          (unless (zerop growth)
+           (unless window-resize-pixelwise
+             (setq growth (min (/ growth (frame-char-height frame)) 1)))
            (setq dragged t)
            (adjust-window-trailing-edge
-            window (if (eq line 'mode) growth (- growth)) nil t))))))
+            window (if (eq line 'mode) growth (- growth)) nil
+            window-resize-pixelwise))))))
     ;; Process the terminating event.
     (when (and (mouse-event-p event) on-link (not dragged)
               (mouse--remap-link-click-p start-event event))