[Emacs-diffs] trunk r116210: Revert last commit in mouse.el.

[Eli Zaretskii]

------------------------------------------------------------
revno: 116210
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2014-01-30 19:42:48 +0200
message:
  Revert last commit in mouse.el.
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 13:19:19 +0000
+++ b/lisp/ChangeLog    2014-01-30 17:42:48 +0000
@@ -1,9 +1,3 @@
-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-30 13:19:19 +0000
+++ b/lisp/mouse.el     2014-01-30 17:42:48 +0000
@@ -475,11 +475,8 @@
                          (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 @@
                  (- (+ (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))