aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2010-04-13 10:19:05 +0200
committerJan Djärv2010-04-13 10:19:05 +0200
commit4bef8d2634d33d234c91be7b95d9c9fb8cfc7a0c (patch)
tree08beb6306990dceaf1d16e42f493931f7e7355c0
parentc1e25821f922d8e6d941f9d7717c054bfd068a47 (diff)
downloademacs-4bef8d2634d33d234c91be7b95d9c9fb8cfc7a0c.tar.gz
emacs-4bef8d2634d33d234c91be7b95d9c9fb8cfc7a0c.zip
(Fx_create_frame, x_create_tip_frame): Set default border width to zero.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xfns.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 94e8a20fb8b..4925c749101 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-04-13 Jan Djärv <jan.h.d@swipnet.se>
2
3 * xfns.c (Fx_create_frame, x_create_tip_frame): Set default border width
4 to zero.
5
12010-04-13 Stefan Monnier <monnier@iro.umontreal.ca> 62010-04-13 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * term.c (init_tty): Move common text outside of #ifdef TERMINFO. 8 * term.c (init_tty): Move common text outside of #ifdef TERMINFO.
diff --git a/src/xfns.c b/src/xfns.c
index ea88c840d54..d19914e8dec 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3376,7 +3376,7 @@ This function is an internal primitive--use `make-frame' instead. */)
3376 3376
3377 /* Frame contents get displaced if an embedded X window has a border. */ 3377 /* Frame contents get displaced if an embedded X window has a border. */
3378 if (! FRAME_X_EMBEDDED_P (f)) 3378 if (! FRAME_X_EMBEDDED_P (f))
3379 x_default_parameter (f, parms, Qborder_width, make_number (2), 3379 x_default_parameter (f, parms, Qborder_width, make_number (0),
3380 "borderWidth", "BorderWidth", RES_TYPE_NUMBER); 3380 "borderWidth", "BorderWidth", RES_TYPE_NUMBER);
3381 3381
3382 /* This defaults to 1 in order to match xterm. We recognize either 3382 /* This defaults to 1 in order to match xterm. We recognize either
@@ -4847,7 +4847,7 @@ x_create_tip_frame (dpyinfo, parms, text)
4847 needed to determine window geometry. */ 4847 needed to determine window geometry. */
4848 x_default_font_parameter (f, parms); 4848 x_default_font_parameter (f, parms);
4849 4849
4850 x_default_parameter (f, parms, Qborder_width, make_number (2), 4850 x_default_parameter (f, parms, Qborder_width, make_number (0),
4851 "borderWidth", "BorderWidth", RES_TYPE_NUMBER); 4851 "borderWidth", "BorderWidth", RES_TYPE_NUMBER);
4852 4852
4853 /* This defaults to 2 in order to match xterm. We recognize either 4853 /* This defaults to 2 in order to match xterm. We recognize either