diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-12-19 00:43:42 -0500 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-12-19 00:43:42 -0500 |
commit | ef1b0ba7e5a82308514b8427cd84994805e61a4f (patch) | |
tree | b859dcfe452c6b493b20c58a2c6af1d8032c296f /src/fontset.c | |
parent | 45720dc368101aa88ba2ec88f6259ae4aaf3d847 (diff) | |
download | emacs-ef1b0ba7e5a82308514b8427cd84994805e61a4f.tar.gz |
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/fontset.c')
-rw-r--r-- | src/fontset.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/fontset.c b/src/fontset.c index 86b9ceb45db..9b140be8d70 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -225,8 +225,7 @@ static void set_fontset_font (Lisp_Object, Lisp_Object); /* Return 1 if ID is a valid fontset id, else return 0. */ static int -fontset_id_valid_p (id) - int id; +fontset_id_valid_p (int id) { return (id >= 0 && id < ASIZE (Vfontset_table) - 1); } @@ -2128,8 +2127,7 @@ DEFUN ("fontset-list", Ffontset_list, Sfontset_list, 0, 0, 0, #ifdef FONTSET_DEBUG Lisp_Object -dump_fontset (fontset) - Lisp_Object fontset; +dump_fontset (Lisp_Object fontset) { Lisp_Object vec; |