From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Joost Kremers Newsgroups: gmane.emacs.bugs Subject: bug#22009: PATCH: Use `window-total-width' in `window-splittable-p' Date: Wed, 25 Nov 2015 14:07:27 +0100 Message-ID: <87io4qgrcg.fsf@fastmail.fm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1448456902 12967 80.91.229.3 (25 Nov 2015 13:08:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 25 Nov 2015 13:08:22 +0000 (UTC) To: 22009@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Nov 25 14:08:09 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1a1Zns-0007Le-0b for geb-bug-gnu-emacs@m.gmane.org; Wed, 25 Nov 2015 14:08:08 +0100 Original-Received: from localhost ([::1]:45195 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1Znt-000299-G2 for geb-bug-gnu-emacs@m.gmane.org; Wed, 25 Nov 2015 08:08:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1Znp-000293-LW for bug-gnu-emacs@gnu.org; Wed, 25 Nov 2015 08:08:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1Znm-0003lr-FE for bug-gnu-emacs@gnu.org; Wed, 25 Nov 2015 08:08:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:34222) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1Znm-0003ln-BG for bug-gnu-emacs@gnu.org; Wed, 25 Nov 2015 08:08:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1a1Znl-0003Pl-RW for bug-gnu-emacs@gnu.org; Wed, 25 Nov 2015 08:08:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Joost Kremers Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 25 Nov 2015 13:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 22009 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.144845687113107 (code B ref -1); Wed, 25 Nov 2015 13:08:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 25 Nov 2015 13:07:51 +0000 Original-Received: from localhost ([127.0.0.1]:52163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1a1Znb-0003PK-Cd for submit@debbugs.gnu.org; Wed, 25 Nov 2015 08:07:51 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:48006) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1a1ZnY-0003P8-I5 for submit@debbugs.gnu.org; Wed, 25 Nov 2015 08:07:49 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1ZnS-0003ix-CL for submit@debbugs.gnu.org; Wed, 25 Nov 2015 08:07:48 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:34388) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1ZnS-0003it-8o for submit@debbugs.gnu.org; Wed, 25 Nov 2015 08:07:42 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58012) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1ZnR-000253-Bn for bug-gnu-emacs@gnu.org; Wed, 25 Nov 2015 08:07:42 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1ZnL-0003if-Gh for bug-gnu-emacs@gnu.org; Wed, 25 Nov 2015 08:07:41 -0500 Original-Received: from out2-smtp.messagingengine.com ([66.111.4.26]:46987) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1ZnL-0003iV-9k for bug-gnu-emacs@gnu.org; Wed, 25 Nov 2015 08:07:35 -0500 Original-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 1D3182034B for ; Wed, 25 Nov 2015 08:07:32 -0500 (EST) Original-Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Wed, 25 Nov 2015 08:07:32 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.fm; h= content-type:date:from:message-id:mime-version:subject:to :x-sasl-enc:x-sasl-enc; s=mesmtp; bh=tjwiGurt3945OzMG8Sj0XHgkzKo =; b=KSz76uRsAkuwPFJUmIuC1Auxf2iRhCTAfdVq37sEil+GIBz6DglmbaYpAnZ 0uge02uOp+9gtc8WvwflOlCxk51k+fiGQtqiPJKzUTpJcx8ZJLijC0/oUReLrAMi uSEmwc2mUdIMQIOReBVjAElbv57bev66fXg1AkIKxrIiuXkA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=tj wiGurt3945OzMG8Sj0XHgkzKo=; b=VeuAjfDcghxkq3PQ9s7EdrrnwClouEI2ia 1MxPIa8cwjYF4GddZp5F/XZQ4PcUDPfu3oHwSUIpfaKBZo+nrDeQsx9JdjYpXaGj iGh/Zi4OM3uRhqlsH60H0HGVRFitbXWI4kwgXNKSHA9kAnhxz3xqY8pCV++8N72c gJZcmDLGg= X-Sasl-enc: tZj+yQMUtmuMIFkgI90bcF2LnCKflX43y40ggcDsxg7Q 1448456851 Original-Received: from IdeaPad.messagingengine.com (eruc065.goemobile.de [134.76.38.65]) by mail.messagingengine.com (Postfix) with ESMTPA id 9EDD4C016FB for ; Wed, 25 Nov 2015 08:07:31 -0500 (EST) User-agent: mu4e 0.9.13; emacs 24.5.50.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:109230 Archived-At: --=-=-= Content-Type: text/plain Following discussion on emacs-devel (thread "Window splitting issues with margins"), this patch replaces the call to `window-width' in `window-splittable-p' with `window-total-width'. This takes the window margins into account when determining if a window can be split horizontally. Note: a similar change to `window-height' isn't necessary, because `window-height' is an alias for `window-total-height'. (Whereas `window-width' is an alias for `window-body-width'.) BTW: this is my first patch. I have no idea if I got all the conventions right... --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-lisp-window.el-window-splittable-p-use-window-total-.patch >From 0fa1f344824530f9ee374cc0d84fa02b61b303bf Mon Sep 17 00:00:00 2001 From: Joost Kremers Date: Wed, 25 Nov 2015 13:36:06 +0100 Subject: [PATCH] * lisp/window.el (window-splittable-p): use `window-total-width' Take the window margins into account when determining if a window can be split horizontally. Copyright-paperwork-exempt: yes --- lisp/window.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/window.el b/lisp/window.el index 6d18905..bcd8922 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -6115,7 +6115,7 @@ window-splittable-p ;; sense nowadays. This can be done more intuitively by ;; setting up `split-width-threshold' appropriately. (numberp split-width-threshold) - (>= (window-width window) + (>= (window-total-width window) (max split-width-threshold (* 2 (max window-min-width 2))))) ;; A window can be split vertically when its height is not -- 2.6.0.GIT --=-=-= Content-Type: text/plain -- Joost Kremers Life has its moments --=-=-=--