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

frame parameters and call to Fmodify_frame_parameters just once.

2 files changed, 11 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b359b8df097..0e3e43c0cc3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 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.
         (x_figure_window_size): Likewise.  Adjust to return long.
         (syms_of_frame): Do not DEFSYM Qterminal_live_p.
diff --git a/src/frame.c b/src/frame.c
index c7353bf42de..9e156f3f0d6 100644
--- 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.  */