Commit f59836fe authored by Kim F. Storm's avatar Kim F. Storm
Browse files

(current_column, current_column_1, Fmove_to_column)

(compute_motion): Adapt to new glyph code encoding.
parent ea92fc1a
...@@ -447,9 +447,9 @@ current_column () ...@@ -447,9 +447,9 @@ current_column ()
next_element_from_display_vector does it. */ next_element_from_display_vector does it. */
Lisp_Object entry = AREF (charvec, i); Lisp_Object entry = AREF (charvec, i);
if (INTEGERP (entry) if (GLYPH_CODE_P (entry)
&& GLYPH_CHAR_VALID_P (XFASTINT (entry))) && GLYPH_CODE_CHAR_VALID_P (entry))
c = FAST_GLYPH_CHAR (XFASTINT (entry)); c = GLYPH_CODE_CHAR (entry);
else else
c = ' '; c = ' ';
} }
...@@ -583,12 +583,11 @@ current_column_1 () ...@@ -583,12 +583,11 @@ current_column_1 ()
{ {
/* This should be handled the same as /* This should be handled the same as
next_element_from_display_vector does it. */ next_element_from_display_vector does it. */
Lisp_Object entry; Lisp_Object entry = AREF (charvec, i);
entry = AREF (charvec, i);
if (INTEGERP (entry) if (GLYPH_CODE_P (entry)
&& GLYPH_CHAR_VALID_P (XFASTINT (entry))) && GLYPH_CODE_CHAR_VALID_P (entry))
c = FAST_GLYPH_CHAR (XFASTINT (entry)); c = GLYPH_CODE_CHAR (entry);
else else
c = ' '; c = ' ';
...@@ -1021,13 +1020,11 @@ The return value is the current column. */) ...@@ -1021,13 +1020,11 @@ The return value is the current column. */)
{ {
/* This should be handled the same as /* This should be handled the same as
next_element_from_display_vector does it. */ next_element_from_display_vector does it. */
Lisp_Object entry = AREF (charvec, i);
Lisp_Object entry; if (GLYPH_CODE_P (entry)
entry = AREF (charvec, i); && GLYPH_CODE_CHAR_VALID_P (entry))
c = GLYPH_CODE_CHAR (entry);
if (INTEGERP (entry)
&& GLYPH_CHAR_VALID_P (XFASTINT (entry)))
c = FAST_GLYPH_CHAR (XFASTINT (entry));
else else
c = ' '; c = ' ';
...@@ -1627,9 +1624,9 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width, ...@@ -1627,9 +1624,9 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
next_element_from_display_vector does it. */ next_element_from_display_vector does it. */
Lisp_Object entry = AREF (charvec, i); Lisp_Object entry = AREF (charvec, i);
if (INTEGERP (entry) if (GLYPH_CODE_P (entry)
&& GLYPH_CHAR_VALID_P (XFASTINT (entry))) && GLYPH_CODE_CHAR_VALID_P (entry))
c = FAST_GLYPH_CHAR (XFASTINT (entry)); c = GLYPH_CODE_CHAR (entry);
else else
c = ' '; c = ' ';
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment