diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-05-28 07:50:26 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-05-28 07:50:26 -0700 |
| commit | 4939beacb33ea91cd35e18fa7d43a4392d47f6f4 (patch) | |
| tree | 89abaf5e14f5baece710d57e32e3575cb2be514a /src | |
| parent | a134691435e107f348becb0b695a36e3e9c8fdac (diff) | |
| parent | bd7b681dc432ce77fbe3634c919fe49ca335f8e1 (diff) | |
Merge from origin/emacs-27
bd7b681dc4 (origin/emacs-27) Tiny texinfo markup fixes
d0dd0e0612 ; Fix more @var/@code mixups in Elisp manual
313dc0439e ; Fix another format-spec typo in the Elisp manual
9d7fd78421 Make next-error behavior a bit more flexible
0691d25295 * etc/NEWS.25: Belatedly announce upcase-dwim and downcase...
df91c94ca8 Fix access to single-byte characters in buffer text
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmds.c | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/cmds.c b/src/cmds.c index 9f96f210b9f..90526612b7a 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -194,7 +194,7 @@ to t. */) SET_PT (newpos); if (PT > newpos - && FETCH_CHAR (PT - 1) == '\n') + && FETCH_BYTE (PT_BYTE - 1) == '\n') { /* If we skipped over a newline that follows an invisible intangible run, @@ -205,7 +205,7 @@ to t. */) break; } else if (PT > newpos && PT < ZV - && FETCH_CHAR (PT) != '\n') + && FETCH_BYTE (PT_BYTE) != '\n') /* If we skipped something intangible and now we're not really at eol, keep going. */ diff --git a/src/xdisp.c b/src/xdisp.c index cf15f579b58..f5a8f2eabf8 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -8290,8 +8290,8 @@ get_visually_first_element (struct it *it) } else if (it->bidi_it.charpos == bob || (!string_p - && (FETCH_CHAR (it->bidi_it.bytepos - 1) == '\n' - || FETCH_CHAR (it->bidi_it.bytepos) == '\n'))) + && (FETCH_BYTE (it->bidi_it.bytepos - 1) == '\n' + || FETCH_BYTE (it->bidi_it.bytepos) == '\n'))) { /* If we are at the beginning of a line/string, we can produce the next element right away. */ @@ -24182,7 +24182,7 @@ the `bidi-class' property of a character. */) itb.charpos = BEGV; itb.bytepos = BEGV_BYTE; } - else if (FETCH_CHAR (from_bpos - 1) == '\n') + else if (FETCH_BYTE (from_bpos - 1) == '\n') { itb.charpos = from_pos; itb.bytepos = from_bpos; |