Commit 240c43e8 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.

(scan_lists, scan_sexps_forward): Pacify the compiler.
parent b3e16b71
2002-10-14 Stefan Monnier <monnier@cs.yale.edu>
* syntax.c (scan_lists): Don't get fooled by a symbol ending with
a backslash-quoted char.
(scan_lists, scan_sexps_forward): Pacify the compiler.
2002-10-13 Richard M. Stallman <rms@gnu.org> 2002-10-13 Richard M. Stallman <rms@gnu.org>
* window.c (window_scroll): Set immediate_quit. * window.c (window_scroll): Set immediate_quit.
...@@ -17,9 +23,9 @@ ...@@ -17,9 +23,9 @@
2002-10-10 Steven Tamm <steventamm@mac.com> 2002-10-10 Steven Tamm <steventamm@mac.com>
* macterm.c (syms_of_macterm, mac_get_mouse_btn): Reversed * macterm.c (syms_of_macterm, mac_get_mouse_btn):
functionality of mac-wheel-button-is-mouse-2 to be correct. Also Reverse functionality of mac-wheel-button-is-mouse-2 to be correct.
switched the default to Qnil from Qt. Also switch the default to Qnil from Qt.
2002-10-08 Kenichi Handa <handa@m17n.org> 2002-10-08 Kenichi Handa <handa@m17n.org>
...@@ -53,7 +59,7 @@ ...@@ -53,7 +59,7 @@
2002-10-04 Steven Tamm <steventamm@mac.com> 2002-10-04 Steven Tamm <steventamm@mac.com>
* macterm.c (keycode_to_xkeysym_table): Change return to be * macterm.c (keycode_to_xkeysym_table): Change return to be
treated like an X keysym treated like an X keysym
2002-10-03 Jan D. <jan.h.d@swipnet.se> 2002-10-03 Jan D. <jan.h.d@swipnet.se>
...@@ -118,8 +124,7 @@ ...@@ -118,8 +124,7 @@
2002-09-26 Kenichi Handa <handa@etl.go.jp> 2002-09-26 Kenichi Handa <handa@etl.go.jp>
* xfaces.c (try_font_list): New arg PREFER_FACE_FAMILY. If it is * xfaces.c (try_font_list): New arg PREFER_FACE_FAMILY. If it is
nonzero, try face's family at first. Otherwise try FAMILY at nonzero, try face's family at first. Otherwise try FAMILY at first.
first.
(choose_face_font): If C is a single byte char or latin-1, call (choose_face_font): If C is a single byte char or latin-1, call
try_font_list with PREFER_FACE_FAMILY 1. try_font_list with PREFER_FACE_FAMILY 1.
......
...@@ -2164,6 +2164,9 @@ scan_lists (from, count, depth, sexpflag) ...@@ -2164,6 +2164,9 @@ scan_lists (from, count, depth, sexpflag)
INC_BOTH (from, from_byte); INC_BOTH (from, from_byte);
if (!depth && sexpflag) goto done; if (!depth && sexpflag) goto done;
break; break;
default:
/* Ignore whitespace, punctuation, quote, endcomment. */
break;
} }
} }
...@@ -2211,7 +2214,10 @@ scan_lists (from, count, depth, sexpflag) ...@@ -2211,7 +2214,10 @@ scan_lists (from, count, depth, sexpflag)
into a word character. Note that this cannot be true into a word character. Note that this cannot be true
if we decremented FROM in the if-statement above. */ if we decremented FROM in the if-statement above. */
if (code != Sendcomment && char_quoted (from, from_byte)) if (code != Sendcomment && char_quoted (from, from_byte))
code = Sword; {
DEC_BOTH (from, from_byte);
code = Sword;
}
else if (SYNTAX_PREFIX (c)) else if (SYNTAX_PREFIX (c))
continue; continue;
...@@ -2332,6 +2338,9 @@ scan_lists (from, count, depth, sexpflag) ...@@ -2332,6 +2338,9 @@ scan_lists (from, count, depth, sexpflag)
DEC_BOTH (from, from_byte); DEC_BOTH (from, from_byte);
if (!depth && sexpflag) goto done2; if (!depth && sexpflag) goto done2;
break; break;
default:
/* Ignore whitespace, punctuation, quote, endcomment. */
break;
} }
} }
...@@ -2675,6 +2684,7 @@ do { prev_from = from; \ ...@@ -2675,6 +2684,7 @@ do { prev_from = from; \
curlevel->prev = curlevel->last; curlevel->prev = curlevel->last;
break; break;
case Scomment_fence: /* Can't happen because it's handled above. */
case Scomment: case Scomment:
if (commentstop || boundary_stop) goto done; if (commentstop || boundary_stop) goto done;
startincomment: startincomment:
...@@ -2770,6 +2780,10 @@ do { prev_from = from; \ ...@@ -2770,6 +2780,10 @@ do { prev_from = from; \
break; break;
case Smath: case Smath:
/* FIXME: We should do something with it. */
break;
default:
/* Ignore whitespace, punctuation, quote, endcomment. */
break; break;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment