* syntax.c (ST_COMMENT_STYLE, ST_STRING_STYLE): Revert this part of the change.

diff --git a/src/ChangeLog b/src/ChangeLog
index fb0057770e656c200ab5bfe147395416fd901ad9..2f825a3797164609cb01b0a5c2e73507f99c2de8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -599,11 +599,7 @@
        Use ptrdiff_t, not EMACS_INT, where ptrdiff_t is wide enough.
        (Fplay_sound_internal):
        Use ptrdiff_t, not int, to avoid needless 32-bit limit on 64-bit hosts.
-       * syntax.c (ST_COMMENT_STYLE, ST_STRING_STYLE):
-       In definitions, make it clearer that these values must be out of range
-       for the respective integer ranges.  This fixes a bug with
-       ST_STRING_STYLE and non-ASCII characters.
-       (struct lisp_parse_state, find_start_modiff)
+       * syntax.c (struct lisp_parse_state, find_start_modiff)
        (Finternal_describe_syntax_value, scan_lists, scan_sexps_forward):
        (Fparse_partial_sexp):
        Don't assume fixnums can fit in int.

diff --git a/src/syntax.c b/src/syntax.c
index c76ffd95bf3b85a88094238261af390fa9496245..7108016f99ce9d3ca38ba55e058c7e93ca6259ae 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -94,8 +94,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    string-ender-char to distinguish  comments/strings started by
    comment_fence and string_fence codes.  */
 
-#define ST_COMMENT_STYLE (SYNTAX_FLAGS_COMMENT_STYLE (~0, ~0) + 1)
-#define ST_STRING_STYLE (MAX_CHAR + 1)
+#define ST_COMMENT_STYLE (256 + 1)
+#define ST_STRING_STYLE (256 + 2)
 
 static Lisp_Object Qsyntax_table_p;
 static Lisp_Object Qsyntax_table, Qscan_error;