[Emacs-diffs] trunk r113307: Fix vertical cursor motion with non-default fonts.

[Eli Zaretskii]

------------------------------------------------------------
revno: 113307
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14567
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2013-07-06 20:38:24 +0300
message:
  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)
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/simple.el                 simple.el-20091113204419-o5vbwnq5f7feedwu-403

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-07-06 16:17:16 +0000
+++ b/lisp/ChangeLog    2013-07-06 17:38:24 +0000
@@ -1,3 +1,8 @@
+2013-07-06  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/tramp-sh.el (tramp-sh-file-gvfs-monitor-dir-process-filter):

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2013-07-06 13:31:59 +0000
+++ b/lisp/simple.el    2013-07-06 17:38:24 +0000
@@ -4759,9 +4759,12 @@
                  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.