aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/windmove.el
diff options
context:
space:
mode:
authorJoakim Verona2012-01-23 15:10:06 +0100
committerJoakim Verona2012-01-23 15:10:06 +0100
commit0322b140eead7c94de7f0f6d19a90bd15690b4eb (patch)
tree950c011783cc896d0450084cb5155e54548bfe5b /lisp/windmove.el
parentd5114bfea3ea4c37c57e2af0f3b095be9fcd8bac (diff)
parentcb5850f27c1b4d26957d58e2da2314dd12498671 (diff)
downloademacs-0322b140eead7c94de7f0f6d19a90bd15690b4eb.tar.gz
emacs-0322b140eead7c94de7f0f6d19a90bd15690b4eb.zip
upstream
Diffstat (limited to 'lisp/windmove.el')
-rw-r--r--lisp/windmove.el18
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/windmove.el b/lisp/windmove.el
index 10a564419fb..0523530869b 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -417,17 +417,17 @@ supplied, if ARG is greater or smaller than zero, respectively."
417 (- (nth 3 edges) 1)))) 417 (- (nth 3 edges) 1))))
418 (cond 418 (cond
419 ((> effective-arg 0) 419 ((> effective-arg 0)
420 top-left) 420 top-left)
421 ((< effective-arg 0) 421 ((< effective-arg 0)
422 bottom-right) 422 bottom-right)
423 ((= effective-arg 0) 423 ((= effective-arg 0)
424 (windmove-coord-add 424 (windmove-coord-add
425 top-left 425 top-left
426 (let ((col-row 426 ;; Don't care whether window is horizontally scrolled -
427 (posn-col-row 427 ;; `posn-at-point' handles that already. See also:
428 (posn-at-point (window-point window) window)))) 428 ;; http://lists.gnu.org/archive/html/emacs-devel/2012-01/msg00638.html
429 (cons (- (car col-row) (window-hscroll window)) 429 (posn-col-row
430 (cdr col-row))))))))) 430 (posn-at-point (window-point window) window))))))))
431 431
432;; This uses the reference location in the current window (calculated 432;; This uses the reference location in the current window (calculated
433;; by `windmove-reference-loc' above) to find a reference location 433;; by `windmove-reference-loc' above) to find a reference location