* frame.c (Fmake_terminal_frame): Use store_in_alist to setup

frame parameters and call to Fmodify_frame_parameters just once.

diff --git a/src/ChangeLog b/src/ChangeLog
index b359b8df097e6e2ac4aad63f8361e33e6366ca8f..0e3e43c0cc3ad5fef01717d8037b5eac4b7ffa59 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-31  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * frame.c (Fmake_terminal_frame): Use store_in_alist to setup
+       frame parameters and call to Fmodify_frame_parameters just once.
+
 2013-07-31  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * frame.c (make_frame, x_set_frame_parameters): Use bool for boolean.

diff --git a/src/frame.c b/src/frame.c
index c7353bf42de517f199851bda9ee7213fb764e2e7..9e156f3f0d6858ddf70b47849908e7577c5f1cfb 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -724,16 +724,13 @@ affects all frames on the same terminal device.  */)
   adjust_glyphs (f);
   calculate_costs (f);
   XSETFRAME (frame, f);
+
+  store_in_alist (&parms, Qtty_type, build_string (t->display_info.tty->type));
+  store_in_alist (&parms, Qtty, 
+                 (t->display_info.tty->name
+                  ? build_string (t->display_info.tty->name)
+                  : Qnil));
   Fmodify_frame_parameters (frame, parms);
-  Fmodify_frame_parameters
-    (frame, list1 (Fcons (Qtty_type,
-                         build_string (t->display_info.tty->type))));
-  if (t->display_info.tty->name != NULL)
-    Fmodify_frame_parameters
-      (frame, list1 (Fcons (Qtty,
-                           build_string (t->display_info.tty->name))));
-  else
-    Fmodify_frame_parameters (frame, list1 (Fcons (Qtty, Qnil)));
 
   /* Make the frame face alist be frame-specific, so that each
      frame could change its face definitions independently.  */