diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/frame.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index dac377ebbfe..2667ef41ad0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-06-30 Chong Yidong <cyd@stupidchicken.com> + + * frame.c (get_future_frame_param, Fmake_terminal_frame): Don't + check default-frame-alist. + 2010-06-30 Andreas Schwab <schwab@linux-m68k.org> * process.c (create_process): Avoid using invalid file descriptors. diff --git a/src/frame.c b/src/frame.c index f542595e5f5..c323c61be69 100644 --- a/src/frame.c +++ b/src/frame.c @@ -627,8 +627,7 @@ make_terminal_frame (struct terminal *terminal) /* Get a suitable value for frame parameter PARAMETER for a newly created frame, based on (1) the user-supplied frame parameter - alist SUPPLIED_PARMS, (2) CURRENT_VALUE, and finally, if all else - fails, (3) Vdefault_frame_alist. */ + alist SUPPLIED_PARMS, and (2) CURRENT_VALUE. */ static Lisp_Object get_future_frame_param (Lisp_Object parameter, @@ -642,8 +641,6 @@ get_future_frame_param (Lisp_Object parameter, result = Fassq (parameter, XFRAME (selected_frame)->param_alist); if (NILP (result) && current_value != NULL) result = build_string (current_value); - if (NILP (result)) - result = Fassq (parameter, Vdefault_frame_alist); if (!NILP (result) && !STRINGP (result)) result = XCDR (result); if (NILP (result) || !STRINGP (result)) @@ -748,7 +745,6 @@ affects all frames on the same terminal device. */) adjust_glyphs (f); calculate_costs (f); XSETFRAME (frame, f); - Fmodify_frame_parameters (frame, Vdefault_frame_alist); Fmodify_frame_parameters (frame, parms); Fmodify_frame_parameters (frame, Fcons (Fcons (Qtty_type, build_string (t->display_info.tty->type)), |