--- a/src/window.c	Mon Aug 13 09:47:55 2007 +0200
+++ b/src/window.c	Mon Aug 13 09:49:09 2007 +0200
@@ -213,7 +213,7 @@
   ((markobj) (window->dedicated));
   mark_face_cachels (window->face_cachels, markobj);
   mark_glyph_cachels (window->glyph_cachels, markobj);
-  return (Qnil);
+  return Qnil;
 }
 
 static void
@@ -353,7 +353,7 @@
   p->windows_changed = 1;
   p->shadow_thickness_changed = 1;
 
-  return (val);
+  return val;
 }
 #undef INIT_DISP_VARIABLE
 
@@ -949,7 +949,7 @@
 
   /* At the user level the margin is always specified in characters.
      Internally however it is manipulated in terms of pixels. */
-  return (margin_cwidth * font_width);
+  return margin_cwidth * font_width;
 }
 
 int
@@ -1117,7 +1117,7 @@
 */
        (obj))
 {
-  return (WINDOWP (obj) ? Qt : Qnil);
+  return WINDOWP (obj) ? Qt : Qnil;
 }
 
 DEFUN ("window-live-p", Fwindow_live_p, 1, 1, 0, /*
@@ -1125,7 +1125,7 @@
 */
        (obj))
 {
-  return (WINDOWP (obj) && WINDOW_LIVE_P (XWINDOW (obj)) ? Qt : Qnil);
+  return WINDOWP (obj) && WINDOW_LIVE_P (XWINDOW (obj)) ? Qt : Qnil;
 }
 
 DEFUN ("selected-window", Fselected_window, 0, 1, 0, /*
@@ -1167,7 +1167,7 @@
 */
        (window))
 {
-  return (MINI_WINDOW_P (decode_window (window)) ? Qt : Qnil);
+  return MINI_WINDOW_P (decode_window (window)) ? Qt : Qnil;
 }
 
 DEFUN ("window-first-hchild", Fwindow_first_hchild, 1, 1, 0, /*
@@ -1341,7 +1341,7 @@
 */
        (window))
 {
-  return (make_int (decode_window (window)->pixel_height));
+  return make_int (decode_window (window)->pixel_height);
 }
 
 DEFUN ("window-width", Fwindow_width, 0, 1, 0, /*
@@ -1350,7 +1350,7 @@
 */
        (window))
 {
-  return (make_int (window_char_width (decode_window (window), 0)));
+  return make_int (window_char_width (decode_window (window), 0));
 }
 
 DEFUN ("window-pixel-width", Fwindow_pixel_width, 0, 1, 0, /*
@@ -1358,7 +1358,7 @@
 */
        (window))
 {
-  return (make_int (decode_window (window)->pixel_width));
+  return make_int (decode_window (window)->pixel_width);
 }
 
 DEFUN ("window-hscroll", Fwindow_hscroll, 0, 1, 0, /*
@@ -1366,7 +1366,7 @@
 */
        (window))
 {
-  return (make_int (decode_window (window)->hscroll));
+  return make_int (decode_window (window)->hscroll);
 }
 
 DEFUN ("set-window-hscroll", Fset_window_hscroll, 2, 2, 0, /*
@@ -1495,7 +1495,7 @@
   else
     {
       Bufpos startp = marker_position (w->start[CURRENT_DISP]);
-      return (make_int (end_of_last_line (w, startp)));
+      return make_int (end_of_last_line (w, startp));
     }
 }
 
@@ -2567,10 +2567,7 @@
 	}
     }
 
-  if (type == GET_BUFFER_WINDOW_COUNT)
-    return (make_int (count));
-  else
-    return (best_window);
+  return type == GET_BUFFER_WINDOW_COUNT ? make_int (count) : best_window;
 }
 
 #if 0 /* not currently used */
@@ -2651,7 +2648,7 @@
   if (NILP (w)) abort ();
 #endif
 
-  return (w);
+  return w;
 }
 
 DEFUN ("get-largest-window", Fget_largest_window, 0, 2, 0, /*
@@ -5032,6 +5029,8 @@
       else
 	set_frame_selected_window (f, config->current_window);
     }
+  else
+    old_window_config = Qnil; /* Warning suppression */
 
   /* Restore the minimum heights recorded in the configuration.  */
   window_min_height = config->min_height;