diff options
| author | Richard M. Stallman | 1996-09-27 06:53:49 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1996-09-27 06:53:49 +0000 |
| commit | 2a8a07d41bb22655151824743b737079eafc7059 (patch) | |
| tree | 93a8ff43fcf489cd11a759d9dbf5aa1405261cf8 /src | |
| parent | d793b10560c29d47092470c0b1b21f9c469b924f (diff) | |
| download | emacs-2a8a07d41bb22655151824743b737079eafc7059.tar.gz emacs-2a8a07d41bb22655151824743b737079eafc7059.zip | |
(x_set_internal_border_width, Fx_create_frame):
Call widget_store_internal_border.
(Fx_create_frame): Don't use a superclass when
checking for an internalBorder resource.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/xfns.c b/src/xfns.c index 96592c6decf..76ad6f2412f 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -1632,6 +1632,10 @@ x_set_internal_border_width (f, arg, oldval) | |||
| 1632 | if (f->output_data.x->internal_border_width < 0) | 1632 | if (f->output_data.x->internal_border_width < 0) |
| 1633 | f->output_data.x->internal_border_width = 0; | 1633 | f->output_data.x->internal_border_width = 0; |
| 1634 | 1634 | ||
| 1635 | if (f->output_data.x->edit_widget) | ||
| 1636 | widget_store_internal_border (f->output_data.x->edit_widget, | ||
| 1637 | f->output_data.x->internal_border_width); | ||
| 1638 | |||
| 1635 | if (f->output_data.x->internal_border_width == old) | 1639 | if (f->output_data.x->internal_border_width == old) |
| 1636 | return; | 1640 | return; |
| 1637 | 1641 | ||
| @@ -3201,13 +3205,13 @@ This function is an internal primitive--use `make-frame' instead.") | |||
| 3201 | Lisp_Object value; | 3205 | Lisp_Object value; |
| 3202 | 3206 | ||
| 3203 | value = x_get_arg (parms, Qinternal_border_width, | 3207 | value = x_get_arg (parms, Qinternal_border_width, |
| 3204 | "internalBorder", "BorderWidth", number); | 3208 | "internalBorder", "internalBorder", number); |
| 3205 | if (! EQ (value, Qunbound)) | 3209 | if (! EQ (value, Qunbound)) |
| 3206 | parms = Fcons (Fcons (Qinternal_border_width, value), | 3210 | parms = Fcons (Fcons (Qinternal_border_width, value), |
| 3207 | parms); | 3211 | parms); |
| 3208 | } | 3212 | } |
| 3209 | x_default_parameter (f, parms, Qinternal_border_width, make_number (1), | 3213 | x_default_parameter (f, parms, Qinternal_border_width, make_number (1), |
| 3210 | "internalBorderWidth", "BorderWidth", number); | 3214 | "internalBorderWidth", "internalBorderWidth", number); |
| 3211 | x_default_parameter (f, parms, Qvertical_scroll_bars, Qleft, | 3215 | x_default_parameter (f, parms, Qvertical_scroll_bars, Qleft, |
| 3212 | "verticalScrollBars", "ScrollBars", boolean); | 3216 | "verticalScrollBars", "ScrollBars", boolean); |
| 3213 | 3217 | ||