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.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/window.c b/src/window.c
index a2a0c793111..e66fde9ec02 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3522,11 +3522,12 @@ This function runs `window-scroll-functions' before running
   else if (!EQ (tem, Qt))
     /* w->buffer is t when the window is first being set up.  */
     {
-      if (!EQ (tem, buffer))
-        if (EQ (w->dedicated, Qt))
-          error ("Window is dedicated to `%s'", SDATA (XBUFFER (tem)->name));
-        else
-          w->dedicated = Qnil;
+      if (EQ (tem, buffer))
+        return Qnil;
+      else if (EQ (w->dedicated, Qt))
+        error ("Window is dedicated to `%s'", SDATA (XBUFFER (tem)->name));
+      else
+        w->dedicated = Qnil;
 
       unshow_buffer (w);
     }