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 @@ | |||
| 1 | 2010-06-30 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * frame.c (get_future_frame_param, Fmake_terminal_frame): Don't | ||
| 4 | check default-frame-alist. | ||
| 5 | |||
| 1 | 2010-06-30 Andreas Schwab <schwab@linux-m68k.org> | 6 | 2010-06-30 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 7 | ||
| 3 | * process.c (create_process): Avoid using invalid file descriptors. | 8 | * 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) | |||
| 627 | 627 | ||
| 628 | /* Get a suitable value for frame parameter PARAMETER for a newly | 628 | /* Get a suitable value for frame parameter PARAMETER for a newly |
| 629 | created frame, based on (1) the user-supplied frame parameter | 629 | created frame, based on (1) the user-supplied frame parameter |
| 630 | alist SUPPLIED_PARMS, (2) CURRENT_VALUE, and finally, if all else | 630 | alist SUPPLIED_PARMS, and (2) CURRENT_VALUE. */ |
| 631 | fails, (3) Vdefault_frame_alist. */ | ||
| 632 | 631 | ||
| 633 | static Lisp_Object | 632 | static Lisp_Object |
| 634 | get_future_frame_param (Lisp_Object parameter, | 633 | get_future_frame_param (Lisp_Object parameter, |
| @@ -642,8 +641,6 @@ get_future_frame_param (Lisp_Object parameter, | |||
| 642 | result = Fassq (parameter, XFRAME (selected_frame)->param_alist); | 641 | result = Fassq (parameter, XFRAME (selected_frame)->param_alist); |
| 643 | if (NILP (result) && current_value != NULL) | 642 | if (NILP (result) && current_value != NULL) |
| 644 | result = build_string (current_value); | 643 | result = build_string (current_value); |
| 645 | if (NILP (result)) | ||
| 646 | result = Fassq (parameter, Vdefault_frame_alist); | ||
| 647 | if (!NILP (result) && !STRINGP (result)) | 644 | if (!NILP (result) && !STRINGP (result)) |
| 648 | result = XCDR (result); | 645 | result = XCDR (result); |
| 649 | if (NILP (result) || !STRINGP (result)) | 646 | if (NILP (result) || !STRINGP (result)) |
| @@ -748,7 +745,6 @@ affects all frames on the same terminal device. */) | |||
| 748 | adjust_glyphs (f); | 745 | adjust_glyphs (f); |
| 749 | calculate_costs (f); | 746 | calculate_costs (f); |
| 750 | XSETFRAME (frame, f); | 747 | XSETFRAME (frame, f); |
| 751 | Fmodify_frame_parameters (frame, Vdefault_frame_alist); | ||
| 752 | Fmodify_frame_parameters (frame, parms); | 748 | Fmodify_frame_parameters (frame, parms); |
| 753 | Fmodify_frame_parameters (frame, Fcons (Fcons (Qtty_type, | 749 | Fmodify_frame_parameters (frame, Fcons (Fcons (Qtty_type, |
| 754 | build_string (t->display_info.tty->type)), | 750 | build_string (t->display_info.tty->type)), |