2 files changed, 14 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a073a1ae32..dcaf8527642 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 9231767576a..d940a762667 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -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))