diff options
| author | Martin Rudalics | 2014-01-30 14:19:19 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2014-01-30 14:19:19 +0100 |
| commit | df1834593692c4103f89de90aaa882a2fb404eb6 (patch) | |
| tree | 2d4614643930a3d5349a5c099879a1901565712e | |
| parent | b169c4cc3724181c4c05d8bd813132b247fff668 (diff) | |
| download | emacs-df1834593692c4103f89de90aaa882a2fb404eb6.tar.gz emacs-df1834593692c4103f89de90aaa882a2fb404eb6.zip | |
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).
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/mouse.el | 10 |
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 @@ | |||
| 1 | 2014-01-30 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * mouse.el (mouse-drag-line): When window-resize-pixelwise is | ||
| 4 | nil call adjust-window-trailing-edge with suitable arguments | ||
| 5 | (Bug#16594). | ||
| 6 | |||
| 1 | 2014-01-30 Glenn Morris <rgm@gnu.org> | 7 | 2014-01-30 Glenn Morris <rgm@gnu.org> |
| 2 | 8 | ||
| 3 | * simple.el (eval-expression): Doc fix. | 9 | * 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'." | |||
| 475 | (nth 2 (window-pixel-edges window)) | 475 | (nth 2 (window-pixel-edges window)) |
| 476 | -1)) | 476 | -1)) |
| 477 | (unless (zerop growth) | 477 | (unless (zerop growth) |
| 478 | (unless window-resize-pixelwise | ||
| 479 | (setq growth (min (/ growth (frame-char-width frame)) 1))) | ||
| 478 | (setq dragged t) | 480 | (setq dragged t) |
| 479 | (adjust-window-trailing-edge window growth t t))) | 481 | (adjust-window-trailing-edge |
| 482 | window growth t window-resize-pixelwise))) | ||
| 480 | (draggable | 483 | (draggable |
| 481 | ;; Drag horizontal divider. | 484 | ;; Drag horizontal divider. |
| 482 | (setq growth | 485 | (setq growth |
| @@ -487,9 +490,12 @@ must be one of the symbols `header', `mode', or `vertical'." | |||
| 487 | (- (+ (nth 3 (window-pixel-edges window)) height) | 490 | (- (+ (nth 3 (window-pixel-edges window)) height) |
| 488 | (cddr position)))) | 491 | (cddr position)))) |
| 489 | (unless (zerop growth) | 492 | (unless (zerop growth) |
| 493 | (unless window-resize-pixelwise | ||
| 494 | (setq growth (min (/ growth (frame-char-height frame)) 1))) | ||
| 490 | (setq dragged t) | 495 | (setq dragged t) |
| 491 | (adjust-window-trailing-edge | 496 | (adjust-window-trailing-edge |
| 492 | window (if (eq line 'mode) growth (- growth)) nil t)))))) | 497 | window (if (eq line 'mode) growth (- growth)) nil |
| 498 | window-resize-pixelwise)))))) | ||
| 493 | ;; Process the terminating event. | 499 | ;; Process the terminating event. |
| 494 | (when (and (mouse-event-p event) on-link (not dragged) | 500 | (when (and (mouse-event-p event) on-link (not dragged) |
| 495 | (mouse--remap-link-click-p start-event event)) | 501 | (mouse--remap-link-click-p start-event event)) |