]> git.eshelyaron.com Git - emacs.git/commitdiff
In mouse-drag-line obey window-resize-pixelwise (Bug#16594).
authorMartin Rudalics <rudalics@gmx.at>
Thu, 30 Jan 2014 13:19:19 +0000 (14:19 +0100)
committerMartin Rudalics <rudalics@gmx.at>
Thu, 30 Jan 2014 13:19:19 +0000 (14:19 +0100)
* mouse.el (mouse-drag-line): When window-resize-pixelwise is
nil call adjust-window-trailing-edge with suitable arguments
(Bug#16594).

lisp/ChangeLog
lisp/mouse.el

index 2a073a1ae325cadb1cfec52a8722d74c686382a6..dcaf8527642df1ce225734b8f58c2522123f120a 100644 (file)
@@ -1,3 +1,9 @@
+2014-01-30  Martin Rudalics  <rudalics@gmx.at>
+
+       * 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  <rgm@gnu.org>
 
        * simple.el (eval-expression): Doc fix.
index 9231767576acc7c394312b4dea79abe2abf8c128..d940a7626675aa9362d2a017464aba4cf4f026a0 100644 (file)
@@ -475,8 +475,11 @@ must be one of the symbols `header', `mode', or `vertical'."
                          (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 @@ must be one of the symbols `header', `mode', or `vertical'."
                  (- (+ (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))