diff options
| author | Stefan Monnier | 2010-12-19 00:43:42 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2010-12-19 00:43:42 -0500 |
| commit | ef1b0ba7e5a82308514b8427cd84994805e61a4f (patch) | |
| tree | b859dcfe452c6b493b20c58a2c6af1d8032c296f /src/lread.c | |
| parent | 45720dc368101aa88ba2ec88f6259ae4aaf3d847 (diff) | |
| download | emacs-ef1b0ba7e5a82308514b8427cd84994805e61a4f.tar.gz emacs-ef1b0ba7e5a82308514b8427cd84994805e61a4f.zip | |
Minor clean up to silence some gcc warnings.
* src/window.c (Fset_window_buffer):
* src/xterm.c (x_set_frame_alpha): Restructure code to silence
compiler warning.
(handle_one_xevent): Remove unused var `p'.
(do_ewmh_fullscreen): Remove unused var `lval'.
(xembed_set_info): Remove unused var `atom'.
* src/textprop.c (Fremove_list_of_text_properties): Add braces to silence
compiler warning.
* src/fontset.c (fontset_id_valid_p, dump_fontset):
* src/ftfont.c (ftfont_drive_otf): Modernize k&r declaration.
* src/eval.c (Feval, Ffuncall): Avoid unneeded gotos.
* src/dispnew.c (update_frame, update_frame_1): Compile the `do_pause'
label only when it's used.
* src/image.c (x_create_bitmap_from_xpm_data):
* src/dispextern.h (x_create_bitmap_from_xpm_data): Use const char** like
its callers.
* src/coding.c (detect_coding_utf_16): Remove unused vars `src_base' and
`consumed_chars'.
(DECODE_EMACS_MULE_21_COMPOSITION): Remove unused var `charbuf_base'.
(decode_coding_emacs_mule): Remove unused label `retry'.
(detect_eol): Add parens to silence compiler warning.
* src/alloc.c (bytes_used_when_reconsidered): Move to the #ifdef where
it's used to silence the compiler.
(make_number): Modernize k&r declaration.
(mark_char_table): Add parens to silence compiler warning.
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lread.c b/src/lread.c index c7b8e70963f..811e83fe2ae 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -2888,10 +2888,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list) | |||
| 2888 | { | 2888 | { |
| 2889 | char *end = read_buffer + read_buffer_size; | 2889 | char *end = read_buffer + read_buffer_size; |
| 2890 | 2890 | ||
| 2891 | while (c > 040 | 2891 | do |
| 2892 | && c != 0x8a0 /* NBSP */ | ||
| 2893 | && (c >= 0200 | ||
| 2894 | || !(strchr ("\"';()[]#`,", c)))) | ||
| 2895 | { | 2892 | { |
| 2896 | if (end - p < MAX_MULTIBYTE_LENGTH) | 2893 | if (end - p < MAX_MULTIBYTE_LENGTH) |
| 2897 | { | 2894 | { |
| @@ -2915,7 +2912,10 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list) | |||
| 2915 | else | 2912 | else |
| 2916 | *p++ = c; | 2913 | *p++ = c; |
| 2917 | c = READCHAR; | 2914 | c = READCHAR; |
| 2918 | } | 2915 | } while (c > 040 |
| 2916 | && c != 0x8a0 /* NBSP */ | ||
| 2917 | && (c >= 0200 | ||
| 2918 | || !(strchr ("\"';()[]#`,", c)))); | ||
| 2919 | 2919 | ||
| 2920 | if (p == end) | 2920 | if (p == end) |
| 2921 | { | 2921 | { |