diff options
| author | Jim Blandy | 1993-06-29 23:04:11 +0000 |
|---|---|---|
| committer | Jim Blandy | 1993-06-29 23:04:11 +0000 |
| commit | ddf768c3cf57a412f525b53aa30f014db963deec (patch) | |
| tree | a5facbafb5c105c5d4f7c94820aa0287f648c798 | |
| parent | b7e264f6806301897e7a60eb429371d8a6392e42 (diff) | |
| download | emacs-ddf768c3cf57a412f525b53aa30f014db963deec.tar.gz emacs-ddf768c3cf57a412f525b53aa30f014db963deec.zip | |
* xfns.c (Fx_create_frame): Check for internalBorder resource, as
well as internalBorderWidth.
| -rw-r--r-- | src/xfns.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c index dcd602542ff..d9dacbccb8d 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -1742,7 +1742,19 @@ be shared by the new frame.") | |||
| 1742 | "font", "Font", string); | 1742 | "font", "Font", string); |
| 1743 | x_default_parameter (f, parms, Qborder_width, make_number (2), | 1743 | x_default_parameter (f, parms, Qborder_width, make_number (2), |
| 1744 | "borderwidth", "BorderWidth", number); | 1744 | "borderwidth", "BorderWidth", number); |
| 1745 | /* This defaults to 2 in order to match xterm. */ | 1745 | /* This defaults to 2 in order to match xterm. We recognize either |
| 1746 | internalBorderWidth or internalBorder (which is what xterm calls | ||
| 1747 | it). */ | ||
| 1748 | if (NILP (Fassq (Qinternal_border_width, parms))) | ||
| 1749 | { | ||
| 1750 | Lisp_Object value; | ||
| 1751 | |||
| 1752 | value = x_get_arg (parms, Qinternal_border_width, | ||
| 1753 | "internalBorder", "BorderWidth", number); | ||
| 1754 | if (! EQ (value, Qunbound)) | ||
| 1755 | parms = Fcons (Fcons (Qinternal_border_width, value), | ||
| 1756 | parms); | ||
| 1757 | } | ||
| 1746 | x_default_parameter (f, parms, Qinternal_border_width, make_number (2), | 1758 | x_default_parameter (f, parms, Qinternal_border_width, make_number (2), |
| 1747 | "internalBorderWidth", "BorderWidth", number); | 1759 | "internalBorderWidth", "BorderWidth", number); |
| 1748 | x_default_parameter (f, parms, Qvertical_scroll_bars, Qt, | 1760 | x_default_parameter (f, parms, Qvertical_scroll_bars, Qt, |