Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 765-770)

   - Update from CVS
   - Merge from emacs--rel--22
   - Merge from gnus--rel--5.10

 * emacs--rel--22  (patch 24-25)
 * gnus--rel--5.10  (patch 222-223)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-16

1 files changed, 6 insertions, 6 deletions

diff --git a/src/syntax.c b/src/syntax.c
index acb5d37825c..9161512a15b 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1276,19 +1276,19 @@ scan_words (from, count)
          position of it.  */
       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 (temp_byte);
+          ch0 = FETCH_CHAR (from_byte);
           code = SYNTAX (ch0);
           if (!(words_include_escapes
                 && (code == Sescape || code == Scharquote)))
             if (code != Sword || WORD_BOUNDARY_P (ch0, ch1))
-              break;
-          DEC_BOTH (from, from_byte);
+              {
+                INC_BOTH (from, from_byte);
+                break;
+              }
           ch1 = ch0;
         }
       count++;