summaryrefslogtreecommitdiff
path: root/src/xfns.c
diff options
context:
space:
mode:
authorJim Blandy <jimb@redhat.com>1993-06-29 23:04:11 +0000
committerJim Blandy <jimb@redhat.com>1993-06-29 23:04:11 +0000
commitddf768c3cf57a412f525b53aa30f014db963deec (patch)
treea5facbafb5c105c5d4f7c94820aa0287f648c798 /src/xfns.c
parentb7e264f6806301897e7a60eb429371d8a6392e42 (diff)
downloademacs-ddf768c3cf57a412f525b53aa30f014db963deec.tar.gz
* xfns.c (Fx_create_frame): Check for internalBorder resource, as
well as internalBorderWidth.
Diffstat (limited to 'src/xfns.c')
-rw-r--r--src/xfns.c14
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.")
"font", "Font", string);
x_default_parameter (f, parms, Qborder_width, make_number (2),
"borderwidth", "BorderWidth", number);
- /* This defaults to 2 in order to match xterm. */
+ /* This defaults to 2 in order to match xterm. We recognize either
+ internalBorderWidth or internalBorder (which is what xterm calls
+ it). */
+ if (NILP (Fassq (Qinternal_border_width, parms)))
+ {
+ Lisp_Object value;
+
+ value = x_get_arg (parms, Qinternal_border_width,
+ "internalBorder", "BorderWidth", number);
+ if (! EQ (value, Qunbound))
+ parms = Fcons (Fcons (Qinternal_border_width, value),
+ parms);
+ }
x_default_parameter (f, parms, Qinternal_border_width, make_number (2),
"internalBorderWidth", "BorderWidth", number);
x_default_parameter (f, parms, Qvertical_scroll_bars, Qt,