mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-03 14:10:47 -08:00
Code Issues Projects Releases Wiki Activity

Fix line-move-visual's following of column in R2L lines (backport from trunk).

Browse source 
src/simple.el (line-move-visual): When converting X pixel coordinate
 to temporary-goal-column, adjust the value for right-to-left
 screen lines.  This fixes vertical-motion, next/prev-line, etc.

 src/dispnew.c (buffer_posn_from_coords): Fix the value of the column
 returned for right-to-left screen lines.  (Before the change on
 2014-12-30, the incorrectly-computed X pixel coordinate concealed
 this bug.)

(cherry picked from commit 5fbd17e369)

Conflicts:
	lisp/simple.el
This commit is contained in:
Eli Zaretskii 2015-01-08 16:04:46 +02:00
parent 2a57b7e5b4
commit 7c0bfa1d08
4 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2015-01-08 Eli Zaretskii <eliz@gnu.org>
* simple.el (line-move-visual): When converting X pixel coordinate
to temporary-goal-column, adjust the value for right-to-left
screen lines. This fixes vertical-motion, next/prev-line, etc.
2015-01-06 Glenn Morris <rgm@gnu.org>
* progmodes/sh-script.el (sh-mode): Doc fix.

15
lisp/simple.el
View file

@ -5254,15 +5254,24 @@ If NOERROR, don't signal an error if we can't move that many lines."
(> (cdr temporary-goal-column) 0))
(setq target-hscroll (cdr temporary-goal-column)))
;; Otherwise, we should reset `temporary-goal-column'.
(let ((posn (posn-at-point)))
(let ((posn (posn-at-point))
x-pos)
(cond
;; Handle the `overflow-newline-into-fringe' case:
((eq (nth 1 posn) 'right-fringe)
(setq temporary-goal-column (cons (- (window-width) 1) hscroll)))
((car (posn-x-y posn))
(setq x-pos (car (posn-x-y posn)))
;; In R2L lines, the X pixel coordinate is measured from the
;; left edge of the window, but columns are still counted
;; from the logical-order beginning of the line, i.e. from
;; the right edge in this case. We need to adjust for that.
(if (eq (current-bidi-paragraph-direction) 'right-to-left)
(setq x-pos (- (window-body-width nil t) 1 x-pos)))
(setq temporary-goal-column
(cons (/ (float (car (posn-x-y posn)))
(frame-char-width)) hscroll))))))
(cons (/ (float x-pos)
(frame-char-width))
hscroll))))))
(if target-hscroll
(set-window-hscroll (selected-window) target-hscroll))
;; vertical-motion can move more than it was asked to if it moves

7
src/ChangeLog
View file

@ -1,3 +1,10 @@
2015-01-08 Eli Zaretskii <eliz@gnu.org>
* dispnew.c (buffer_posn_from_coords): Fix the value of the column
returned for right-to-left screen lines. (Before the change on
2014-12-30, the incorrectly-computed X pixel coordinate concealed
this bug.)
2015-01-05 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (move_it_to, try_cursor_movement): Don't use the window

8
src/dispnew.c
View file

@ -5153,7 +5153,7 @@ buffer_posn_from_coords (struct window *w, int *x, int *y, struct display_pos *p
Fset_buffer (old_current_buffer);
*dx = x0 + it.first_visible_x - it.current_x;
*dx = to_x - it.current_x;
*dy = *y - it.current_y;
string = w->contents;
@ -5228,9 +5228,9 @@ buffer_posn_from_coords (struct window *w, int *x, int *y, struct display_pos *p
}
/* Add extra (default width) columns if clicked after EOL. */
x1 = max (0, it.current_x + it.pixel_width - it.first_visible_x);
if (x0 > x1)
it.hpos += (x0 - x1) / WINDOW_FRAME_COLUMN_WIDTH (w);
x1 = max (0, it.current_x + it.pixel_width);
if (to_x > x1)
it.hpos += (to_x - x1) / WINDOW_FRAME_COLUMN_WIDTH (w);
*x = it.hpos;
*y = it.vpos;