Commit 8458ede6 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(command_loop_1): Use PT_BYTE when calling FETCH_BYTE.

Instead of Fforward_point, just add.
parent 3f236a40
...@@ -1283,8 +1283,8 @@ command_loop_1 () ...@@ -1283,8 +1283,8 @@ command_loop_1 ()
{ {
struct Lisp_Char_Table *dp struct Lisp_Char_Table *dp
= window_display_table (XWINDOW (selected_window)); = window_display_table (XWINDOW (selected_window));
lose = FETCH_BYTE (PT); lose = FETCH_BYTE (PT_BYTE);
SET_PT (forward_point (1)); SET_PT (PT + 1);
if ((dp if ((dp
? (VECTORP (DISP_CHAR_VECTOR (dp, lose)) ? (VECTORP (DISP_CHAR_VECTOR (dp, lose))
? XVECTOR (DISP_CHAR_VECTOR (dp, lose))->size == 1 ? XVECTOR (DISP_CHAR_VECTOR (dp, lose))->size == 1
...@@ -1293,7 +1293,7 @@ command_loop_1 () ...@@ -1293,7 +1293,7 @@ command_loop_1 ()
: (lose >= 0x20 && lose < 0x7f)) : (lose >= 0x20 && lose < 0x7f))
/* To extract the case of continuation on /* To extract the case of continuation on
wide-column characters. */ wide-column characters. */
&& (WIDTH_BY_CHAR_HEAD (FETCH_BYTE (PT)) == 1) && (WIDTH_BY_CHAR_HEAD (FETCH_BYTE (PT_BYTE)) == 1)
&& (XFASTINT (XWINDOW (selected_window)->last_modified) && (XFASTINT (XWINDOW (selected_window)->last_modified)
>= MODIFF) >= MODIFF)
&& (XFASTINT (XWINDOW (selected_window)->last_overlay_modified) && (XFASTINT (XWINDOW (selected_window)->last_overlay_modified)
...@@ -1312,8 +1312,8 @@ command_loop_1 () ...@@ -1312,8 +1312,8 @@ command_loop_1 ()
{ {
struct Lisp_Char_Table *dp struct Lisp_Char_Table *dp
= window_display_table (XWINDOW (selected_window)); = window_display_table (XWINDOW (selected_window));
SET_PT (forward_point (-1)); SET_PT (PT - 1);
lose = FETCH_BYTE (PT); lose = FETCH_BYTE (PT_BYTE);
if ((dp if ((dp
? (VECTORP (DISP_CHAR_VECTOR (dp, lose)) ? (VECTORP (DISP_CHAR_VECTOR (dp, lose))
? XVECTOR (DISP_CHAR_VECTOR (dp, lose))->size == 1 ? XVECTOR (DISP_CHAR_VECTOR (dp, lose))->size == 1
...@@ -1370,7 +1370,7 @@ command_loop_1 () ...@@ -1370,7 +1370,7 @@ command_loop_1 ()
nonundocount = 0; nonundocount = 0;
if (!lose if (!lose
&& (PT == ZV || FETCH_BYTE (PT) == '\n')) && (PT == ZV || FETCH_BYTE (PT_BYTE) == '\n'))
{ {
struct Lisp_Char_Table *dp struct Lisp_Char_Table *dp
= window_display_table (XWINDOW (selected_window)); = window_display_table (XWINDOW (selected_window));
......
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