diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-10-14 04:44:24 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-10-14 04:44:24 +0000 |
| commit | 240c43e89c8fa9b08a4c2718acfc8d4df7b97fbf (patch) | |
| tree | 1360b73de143907d6b50c971a5628dd9880e9044 | |
| parent | b3e16b714c808d01146407140685c832fbf45d81 (diff) | |
| download | emacs-240c43e89c8fa9b08a4c2718acfc8d4df7b97fbf.tar.gz emacs-240c43e89c8fa9b08a4c2718acfc8d4df7b97fbf.tar.bz2 emacs-240c43e89c8fa9b08a4c2718acfc8d4df7b97fbf.zip | |
(scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
(scan_lists, scan_sexps_forward): Pacify the compiler.
| -rw-r--r-- | src/ChangeLog | 17 | ||||
| -rw-r--r-- | src/syntax.c | 16 |
2 files changed, 26 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0363b6c6c8b..40b8d3748f7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +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> * window.c (window_scroll): Set immediate_quit. @@ -17,9 +23,9 @@ 2002-10-10 Steven Tamm <steventamm@mac.com> - * macterm.c (syms_of_macterm, mac_get_mouse_btn): Reversed - functionality of mac-wheel-button-is-mouse-2 to be correct. Also - switched the default to Qnil from Qt. + * macterm.c (syms_of_macterm, mac_get_mouse_btn): + Reverse functionality of mac-wheel-button-is-mouse-2 to be correct. + Also switch the default to Qnil from Qt. 2002-10-08 Kenichi Handa <handa@m17n.org> @@ -53,7 +59,7 @@ 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 2002-10-03 Jan D. <jan.h.d@swipnet.se> @@ -118,8 +124,7 @@ 2002-09-26 Kenichi Handa <handa@etl.go.jp> * xfaces.c (try_font_list): New arg PREFER_FACE_FAMILY. If it is - nonzero, try face's family at first. Otherwise try FAMILY at - first. + nonzero, try face's family at first. Otherwise try FAMILY at first. (choose_face_font): If C is a single byte char or latin-1, call try_font_list with PREFER_FACE_FAMILY 1. diff --git a/src/syntax.c b/src/syntax.c index f020bdbbced..0f2cda592aa 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -2164,6 +2164,9 @@ scan_lists (from, count, depth, sexpflag) INC_BOTH (from, from_byte); if (!depth && sexpflag) goto done; break; + default: + /* Ignore whitespace, punctuation, quote, endcomment. */ + break; } } @@ -2211,7 +2214,10 @@ scan_lists (from, count, depth, sexpflag) into a word character. Note that this cannot be true if we decremented FROM in the if-statement above. */ if (code != Sendcomment && char_quoted (from, from_byte)) - code = Sword; + { + DEC_BOTH (from, from_byte); + code = Sword; + } else if (SYNTAX_PREFIX (c)) continue; @@ -2332,6 +2338,9 @@ scan_lists (from, count, depth, sexpflag) DEC_BOTH (from, from_byte); if (!depth && sexpflag) goto done2; break; + default: + /* Ignore whitespace, punctuation, quote, endcomment. */ + break; } } @@ -2675,6 +2684,7 @@ do { prev_from = from; \ curlevel->prev = curlevel->last; break; + case Scomment_fence: /* Can't happen because it's handled above. */ case Scomment: if (commentstop || boundary_stop) goto done; startincomment: @@ -2770,6 +2780,10 @@ do { prev_from = from; \ break; case Smath: + /* FIXME: We should do something with it. */ + break; + default: + /* Ignore whitespace, punctuation, quote, endcomment. */ break; } } |