>From a4e7df68f81c497830d44479546756aeacf8abc2 Mon Sep 17 00:00:00 2001 From: Timo Savola Date: Tue, 23 Jan 2007 11:57:31 +0200 Subject: [PATCH] xembed-border Fixes issues with the Xlib and X-toolkit versions by ignoring the BorderWidth parameter of embedded X windows. --- src/xfns.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/xfns.c b/src/xfns.c index 716b282..acc40ed 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3266,8 +3266,10 @@ This function is an internal primitive--use `make-frame' instead. */) xlwmenu_default_font = FRAME_FONT (f); #endif - x_default_parameter (f, parms, Qborder_width, make_number (2), - "borderWidth", "BorderWidth", RES_TYPE_NUMBER); + /* Frame contents get displaced if an embedded X window has a border. */ + if (! FRAME_X_EMBEDDED_P (f)) + x_default_parameter (f, parms, Qborder_width, make_number (2), + "borderWidth", "BorderWidth", RES_TYPE_NUMBER); /* This defaults to 1 in order to match xterm. We recognize either internalBorderWidth or internalBorder (which is what xterm calls -- 1.5.2