Fix vertical cursor motion with non-default fonts.

 lisp/simple.el (line-move-partial): Adjust the row returned by
 posn-at-point for the current window-vscroll.  (Bug#14567)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 872f4f566777d705dd70d725510dfbddd9261aca..a4ee883f518c222a5999e6a16c3ccbcc8455dbb1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-06  Eli Zaretskii  <eliz@gnu.org>
+
+       * simple.el (line-move-partial): Adjust the row returned by
+       posn-at-point for the current window-vscroll.  (Bug#14567)
+
 2013-07-06  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp-sh.el (tramp-sh-file-gvfs-monitor-dir-process-filter):

diff --git a/lisp/simple.el b/lisp/simple.el
index c4c7d56dc2a7007c8c19291ef911b6d9a2c7874f..b4b8ddfabed29958471db9e682d3313ad09f67c4 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4759,9 +4759,12 @@ lines."
                  this-height (nth 4 wstart))))
        (setq py
              (or (nth 1 this-lh)
-                 (let ((ppos (posn-at-point)))
-                   (cdr (or (posn-actual-col-row ppos)
-                            (posn-col-row ppos))))))
+                 (let ((ppos (posn-at-point))
+                       col-row)
+                   (setq col-row (posn-actual-col-row ppos))
+                   (if col-row
+                       (- (cdr col-row) (window-vscroll))
+                     (cdr (posn-col-row ppos))))))
        (cond
         ;; If last line of window is fully visible, and vscrolling
         ;; more would make this line invisible, move forward.