#include "lisp.h"
#include "buffer.h"
+#include "commands.h"
+#include "insdel.h"
#include "syntax.h"
/* Here is a comment from Ken'ichi HANDA <handa@etl.go.jp>
two such characters. */
/* Mule 2.4 doesn't seem to have Sextword - I'm removing it -- mrb */
-/* Recovered by tomo */
Lisp_Object Qsyntax_table_p;
\f
-/* Return 1 if there is a word boundary between two word-constituent
- characters C1 and C2 if they appear in this order, else return 0.
- There is no word boundary between two word-constituent ASCII
- characters. */
-#define WORD_BOUNDARY_P(c1, c2) \
- (!(CHAR_ASCII_P (c1) && CHAR_ASCII_P (c2)) \
- && word_boundary_p (c1, c2))
-
-extern int word_boundary_p (Emchar c1, Emchar c2);
+static int
+word_constituent_p (struct buffer *buf, Bufpos pos,
+ struct Lisp_Char_Table *tab)
+{
+ enum syntaxcode code = SYNTAX_UNSAFE (tab, BUF_FETCH_CHAR (buf, pos));
+ return ((words_include_escapes &&
+ (code == Sescape || code == Scharquote))
+ || (code == Sword));
+}
/* Return the position across COUNT words from FROM.
If that many words cannot be found before the end of the buffer, return 0.
{
Bufpos limit = count > 0 ? BUF_ZV (buf) : BUF_BEGV (buf);
struct Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
- Emchar ch0, ch1;
- enum syntaxcode code;
-
while (count > 0)
{
QUIT;
{
if (from == limit)
return 0;
- ch0 = BUF_FETCH_CHAR (buf, from);
- code = SYNTAX_UNSAFE (mirrortab, ch0);
- from++;
- if (words_include_escapes
- && (code == Sescape || code == Scharquote))
- break;
- if (code == Sword)
+ if (word_constituent_p (buf, from, mirrortab))
break;
+ from++;
}
QUIT;
- while ( from != limit )
+ while ((from != limit) && word_constituent_p (buf, from, mirrortab))
{
- ch1 = BUF_FETCH_CHAR (buf, from);
- code = SYNTAX_UNSAFE (mirrortab, ch1);
- if (!(words_include_escapes
- && (code == Sescape || code == Scharquote)))
- if (code != Sword || WORD_BOUNDARY_P (ch0, ch1))
- break;
from++;
- ch0 = ch1;
}
count--;
}
{
if (from == limit)
return 0;
- from--;
- ch1 = BUF_FETCH_CHAR (buf, from - 1);
- code = SYNTAX_UNSAFE (mirrortab, ch1);
- if (words_include_escapes
- && (code == Sescape || code == Scharquote))
- break;
- if (code == Sword)
+ if (word_constituent_p (buf, from - 1, mirrortab))
break;
+ from--;
}
QUIT;
- while ( from != limit )
+ while ((from != limit) && word_constituent_p (buf, from - 1, mirrortab))
{
- ch0 = BUF_FETCH_CHAR (buf, from - 1);
- code = SYNTAX_UNSAFE (mirrortab, ch0);
- if (!(words_include_escapes
- && (code == Sescape || code == Scharquote)))
- if (code != Sword || WORD_BOUNDARY_P (ch0, ch1))
- break;
from--;
- ch1 = ch0;
}
count++;
}
}
DEFUN ("forward-word", Fforward_word, 1, 2, "_p", /*
-Move point forward COUNT words (backward if COUNT is negative).
+Move point forward ARG words (backward if ARG is negative).
Normally returns t.
If an edge of the buffer is reached, point is left there
and nil is returned.
-
-Optional argument BUFFER defaults to the current buffer.
*/
(count, buffer))
{
Vstandard_syntax_table = Fcopy_syntax_table (Qnil);
staticpro (&Vstandard_syntax_table);
- Vsyntax_designator_chars_string = make_string_nocopy (syntax_code_spec,
- Smax);
+ Vsyntax_designator_chars_string = make_pure_string (syntax_code_spec,
+ Smax, Qnil, 1);
staticpro (&Vsyntax_designator_chars_string);
fill_char_table (XCHAR_TABLE (Vstandard_syntax_table),