Mercurial > emacs
comparison src/window.c @ 111997:a5a188ddc758
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.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Sun, 19 Dec 2010 00:43:42 -0500 |
parents | b4dbe6c4111e |
children | ac49e05bfcf2 |
comparison
equal
deleted
inserted
replaced
111996:90a2d870e83e | 111997:a5a188ddc758 |
---|---|
3520 if (NILP (tem)) | 3520 if (NILP (tem)) |
3521 error ("Window is deleted"); | 3521 error ("Window is deleted"); |
3522 else if (!EQ (tem, Qt)) | 3522 else if (!EQ (tem, Qt)) |
3523 /* w->buffer is t when the window is first being set up. */ | 3523 /* w->buffer is t when the window is first being set up. */ |
3524 { | 3524 { |
3525 if (!EQ (tem, buffer)) | 3525 if (EQ (tem, buffer)) |
3526 if (EQ (w->dedicated, Qt)) | 3526 return Qnil; |
3527 error ("Window is dedicated to `%s'", SDATA (XBUFFER (tem)->name)); | 3527 else if (EQ (w->dedicated, Qt)) |
3528 else | 3528 error ("Window is dedicated to `%s'", SDATA (XBUFFER (tem)->name)); |
3529 w->dedicated = Qnil; | 3529 else |
3530 w->dedicated = Qnil; | |
3530 | 3531 |
3531 unshow_buffer (w); | 3532 unshow_buffer (w); |
3532 } | 3533 } |
3533 | 3534 |
3534 set_window_buffer (window, buffer, 1, !NILP (keep_margins)); | 3535 set_window_buffer (window, buffer, 1, !NILP (keep_margins)); |