diff options
| author | Gerd Moellmann | 1999-12-22 16:09:37 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 1999-12-22 16:09:37 +0000 |
| commit | 28d7281dc701dd03bcda8b0470ec596520e5d6c5 (patch) | |
| tree | e1256f29bba9307de3d767754a0e075ff4283046 /src | |
| parent | e22ef6eb695025c26286d5a13ad2696efbf7cb85 (diff) | |
| download | emacs-28d7281dc701dd03bcda8b0470ec596520e5d6c5.tar.gz emacs-28d7281dc701dd03bcda8b0470ec596520e5d6c5.zip | |
(Fx_create_frame): Move x_default_parameter calls that
lead to size changes to after the X window has been created.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/xfns.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index eab72435508..ca642ac01c1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 1999-12-22 Gerd Moellmann <gerd@gnu.org> | 1 | 1999-12-22 Gerd Moellmann <gerd@gnu.org> |
| 2 | 2 | ||
| 3 | * xfns.c (Fx_create_frame): Move x_default_parameter calls that | ||
| 4 | lead to size changes to after the X window has been created. | ||
| 5 | |||
| 3 | * xfaces.c (realize_x_face): Don't use uninitialized local | 6 | * xfaces.c (realize_x_face): Don't use uninitialized local |
| 4 | variable in xassert. | 7 | variable in xassert. |
| 5 | 8 | ||
diff --git a/src/xfns.c b/src/xfns.c index 2f06de41ff4..33489df994e 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -3766,9 +3766,6 @@ This function is an internal primitive--use `make-frame' instead.") | |||
| 3766 | "menuBar", "MenuBar", RES_TYPE_NUMBER); | 3766 | "menuBar", "MenuBar", RES_TYPE_NUMBER); |
| 3767 | x_default_parameter (f, parms, Qtool_bar_lines, make_number (0), | 3767 | x_default_parameter (f, parms, Qtool_bar_lines, make_number (0), |
| 3768 | "toolBar", "ToolBar", RES_TYPE_NUMBER); | 3768 | "toolBar", "ToolBar", RES_TYPE_NUMBER); |
| 3769 | x_default_parameter (f, parms, Qscroll_bar_width, Qnil, | ||
| 3770 | "scrollBarWidth", "ScrollBarWidth", | ||
| 3771 | RES_TYPE_NUMBER); | ||
| 3772 | x_default_parameter (f, parms, Qbuffer_predicate, Qnil, | 3769 | x_default_parameter (f, parms, Qbuffer_predicate, Qnil, |
| 3773 | "bufferPredicate", "BufferPredicate", | 3770 | "bufferPredicate", "BufferPredicate", |
| 3774 | RES_TYPE_SYMBOL); | 3771 | RES_TYPE_SYMBOL); |
| @@ -3830,6 +3827,9 @@ This function is an internal primitive--use `make-frame' instead.") | |||
| 3830 | "autoLower", "AutoRaiseLower", RES_TYPE_BOOLEAN); | 3827 | "autoLower", "AutoRaiseLower", RES_TYPE_BOOLEAN); |
| 3831 | x_default_parameter (f, parms, Qcursor_type, Qbox, | 3828 | x_default_parameter (f, parms, Qcursor_type, Qbox, |
| 3832 | "cursorType", "CursorType", RES_TYPE_SYMBOL); | 3829 | "cursorType", "CursorType", RES_TYPE_SYMBOL); |
| 3830 | x_default_parameter (f, parms, Qscroll_bar_width, Qnil, | ||
| 3831 | "scrollBarWidth", "ScrollBarWidth", | ||
| 3832 | RES_TYPE_NUMBER); | ||
| 3833 | 3833 | ||
| 3834 | /* Dimensions, especially f->height, must be done via change_frame_size. | 3834 | /* Dimensions, especially f->height, must be done via change_frame_size. |
| 3835 | Change will not be effected unless different from the current | 3835 | Change will not be effected unless different from the current |