[Emacs-diffs] trunk r117591: * frame.c (x_set_frame_parameters): Don't use uninitialized locals.

[Paul Eggert]

------------------------------------------------------------
revno: 117591
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2014-07-27 19:13:11 -0700
message:
  * frame.c (x_set_frame_parameters): Don't use uninitialized locals.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-07-27 14:45:26 +0000
+++ b/src/ChangeLog     2014-07-28 02:13:11 +0000
@@ -1,3 +1,7 @@
+2014-07-28  Paul Eggert  <address@hidden>
+
+       * frame.c (x_set_frame_parameters): Don't use uninitialized locals.
+
 2014-07-27  Jan Djärv  <address@hidden>
 
        * nsterm.m (applicationDidFinishLaunching antialiasThresholdDidChange):

=== modified file 'src/frame.c'
--- a/src/frame.c       2014-07-27 13:21:30 +0000
+++ b/src/frame.c       2014-07-28 02:13:11 +0000
@@ -637,7 +637,7 @@
   f->column_width = 1;  /* !FRAME_WINDOW_P value.  */
   f->line_height = 1;  /* !FRAME_WINDOW_P value.  */
 #ifdef HAVE_WINDOW_SYSTEM
-  f->vertical_scroll_bar_type = vertical_scroll_bar_none;  
+  f->vertical_scroll_bar_type = vertical_scroll_bar_none;
   f->horizontal_scroll_bars = false;
   f->want_fullscreen = FULLSCREEN_NONE;
 #if ! defined (USE_GTK) && ! defined (HAVE_NS)
@@ -914,10 +914,10 @@
   FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR;
 #endif /* not MSDOS */
 
-#ifdef HAVE_WINDOW_SYSTEM  
+#ifdef HAVE_WINDOW_SYSTEM
   f->vertical_scroll_bar_type = vertical_scroll_bar_none;
   FRAME_HAS_HORIZONTAL_SCROLL_BARS (f) = false;
-#endif  
+#endif
 
   FRAME_MENU_BAR_LINES (f) = NILP (Vmenu_bar_mode) ? 0 : 1;
   FRAME_MENU_BAR_HEIGHT (f) = FRAME_MENU_BAR_LINES (f) * FRAME_LINE_HEIGHT (f);
@@ -1666,9 +1666,9 @@
   fset_buried_buffer_list (f, Qnil);
 
   free_font_driver_list (f);
-#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)  
+#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
   xfree (f->namebuf);
-#endif  
+#endif
   xfree (f->decode_mode_spec_buffer);
   xfree (FRAME_INSERT_COST (f));
   xfree (FRAME_DELETEN_COST (f));
@@ -3203,10 +3203,9 @@
 
     XSETFRAME (frame, f);
 
-    if ((width_change || height_change)
-        && (width != FRAME_TEXT_WIDTH (f)
-            || height != FRAME_TEXT_HEIGHT (f)
-            || f->new_height || f->new_width))
+    if (((width_change && width != FRAME_TEXT_WIDTH (f))
+        || (height_change && height != FRAME_TEXT_HEIGHT (f)))
+        && (f->new_height || f->new_width))
       {
        /* If necessary provide default values for HEIGHT and WIDTH.  Do
           that here since otherwise a size change implied by an