diff options
| author | Miles Bader <miles@gnu.org> | 2007-05-24 21:31:10 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-05-24 21:31:10 +0000 |
| commit | 262be72a9aaa800d38cd25b12acb8c9b7b21d5d6 (patch) | |
| tree | 0940ebc7acd6379243e7194446acbd4f062be4f3 /src/syntax.c | |
| parent | 5e1d0c0a38c22adc02d1b77bdc1d620fab26e52d (diff) | |
| parent | a02a3c235e3ec24acaf2014e6c60c0b4138ff86f (diff) | |
| download | emacs-262be72a9aaa800d38cd25b12acb8c9b7b21d5d6.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 751-770)
- Update from CVS
- Merge from emacs--rel--22
- Update from CVS: lisp/textmodes/sgml-mode.el: Revert last change.
- Merge from gnus--rel--5.10
* emacs--rel--22 (patch 18-25)
* gnus--rel--5.10 (patch 222-223)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-208
Diffstat (limited to 'src/syntax.c')
| -rw-r--r-- | src/syntax.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/syntax.c b/src/syntax.c index a1de152fd43..f40900834a3 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -1299,20 +1299,20 @@ scan_words (from, count) script = CHAR_TABLE_REF (Vchar_script_table, ch1); while (1) { - int temp_byte; - if (from == beg) break; - temp_byte = dec_bytepos (from_byte); + DEC_BOTH (from, from_byte); UPDATE_SYNTAX_TABLE_BACKWARD (from); - ch0 = FETCH_CHAR_AS_MULTIBYTE (temp_byte); + ch0 = FETCH_CHAR_AS_MULTIBYTE (from_byte); code = SYNTAX (ch0); if ((code != Sword && (! words_include_escapes || (code != Sescape && code != Scharquote))) || ! EQ (CHAR_TABLE_REF (Vchar_script_table, ch0), script)) - break; - DEC_BOTH (from, from_byte); + { + INC_BOTH (from, from_byte); + break; + } ch1 = ch0; } } @@ -2031,13 +2031,13 @@ skip_syntaxes (forwardp, string, lim) p = GPT_ADDR; stop = endp; } + UPDATE_SYNTAX_TABLE_BACKWARD (pos - 1); prev_p = p; while (--p >= stop && ! CHAR_HEAD_P (*p)); c = STRING_CHAR (p, MAX_MULTIBYTE_LENGTH); if (! fastmap[(int) SYNTAX (c)]) break; pos--, pos_byte -= prev_p - p; - UPDATE_SYNTAX_TABLE_BACKWARD (pos); } } else |