Revert last commit in mouse.el.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dcaf8527642df1ce225734b8f58c2522123f120a..2a073a1ae325cadb1cfec52a8722d74c686382a6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,3 @@
-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 d940a7626675aa9362d2a017464aba4cf4f026a0..9231767576acc7c394312b4dea79abe2abf8c128 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -475,11 +475,8 @@ 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 window-resize-pixelwise)))
+           (adjust-window-trailing-edge window growth t t)))
         (draggable
          ;; Drag horizontal divider.
          (setq growth
@@ -490,12 +487,9 @@ 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
-            window-resize-pixelwise))))))
+            window (if (eq line 'mode) growth (- growth)) nil t))))))
     ;; Process the terminating event.
     (when (and (mouse-event-p event) on-link (not dragged)
               (mouse--remap-link-click-p start-event event))