From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.bugs Subject: bug#3142: 23.0.92; split-window-prefered-function should be able to use split-window-horizontally/split-window-vertically Date: Fri, 01 May 2009 10:33:53 +0200 Message-ID: <49FAB3F1.7040301@gmx.at> References: <49F6A25B.3050108@gmx.at> <874ow84cp6.fsf_-_@mail.jurta.org> <49F7FE0F.1020107@gmx.at> <49F9673F.6000806@gmx.at> <87ljpiuyi0.fsf@mail.jurta.org> Reply-To: martin rudalics , 3142@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------030702030003060502010002" X-Trace: ger.gmane.org 1241174615 16359 80.91.229.12 (1 May 2009 10:43:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 1 May 2009 10:43:35 +0000 (UTC) Cc: 3142@emacsbugs.donarmstrong.com, Jared Finder To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri May 01 12:43:25 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1LzqDE-0006IG-Qd for geb-bug-gnu-emacs@m.gmane.org; Fri, 01 May 2009 12:43:25 +0200 Original-Received: from localhost ([127.0.0.1]:38753 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LzqDE-0003kl-8Q for geb-bug-gnu-emacs@m.gmane.org; Fri, 01 May 2009 06:43:24 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LzqD9-0003iL-C2 for bug-gnu-emacs@gnu.org; Fri, 01 May 2009 06:43:19 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LzqD4-0003Yy-5u for bug-gnu-emacs@gnu.org; Fri, 01 May 2009 06:43:18 -0400 Original-Received: from [199.232.76.173] (port=45171 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LzqD4-0003Yd-2j for bug-gnu-emacs@gnu.org; Fri, 01 May 2009 06:43:14 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:48783) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LzqD3-0005LE-8n for bug-gnu-emacs@gnu.org; Fri, 01 May 2009 06:43:13 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n41AVpSi026899; Fri, 1 May 2009 03:31:53 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id n41AF41c021803; Fri, 1 May 2009 03:15:04 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: martin rudalics Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Fri, 01 May 2009 10:15:04 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: followup 3142 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 3142-submit@emacsbugs.donarmstrong.com id=B3142.124117242820249 (code B ref 3142); Fri, 01 May 2009 10:15:04 +0000 Original-Received: (at 3142) by emacsbugs.donarmstrong.com; 1 May 2009 10:07:08 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with SMTP id n41A72Eu020230 for <3142@emacsbugs.donarmstrong.com>; Fri, 1 May 2009 03:07:03 -0700 Original-Received: (qmail invoked by alias); 01 May 2009 10:06:56 -0000 Original-Received: from 62-47-59-240.adsl.highway.telekom.at (EHLO [62.47.59.240]) [62.47.59.240] by mail.gmx.net (mp071) with SMTP; 01 May 2009 12:06:56 +0200 X-Authenticated: #14592706 X-Provags-ID: V01U2FsdGVkX189WAI8n8w9pC+LlzOfNTbfpjaX4PafUYNI8ljG41 dZsontFaqhoKcJ User-Agent: Thunderbird 2.0.0.16 (Windows/20080708) In-Reply-To: <87ljpiuyi0.fsf@mail.jurta.org> X-Y-GMX-Trusted: 0 X-FuHaFi: 0.7,0.53 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Resent-Date: Fri, 01 May 2009 06:43:18 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:27585 Archived-At: This is a multi-part message in MIME format. --------------030702030003060502010002 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit >> + (defcustom split-window-preferred-function 'split-selected-window >> + "Function called by `display-buffer' to split a window. >> + The window that shall be split is selected when this function is >> + called. The function is supposed to either return the new window >> + or nil if the window can (or shall) not be split." >> + :type 'function >> + :version "23.1" >> + :group 'windows) > > If setting this option to `split-window-horizontally' and > `split-window-vertically' is possible and it works correctly > with these value, then I suggest adding them as constants, > e.g. "Always split horizontally" and "Always split vertically". Done. But note that a function like `split-window-vertically' is suited for interactive use and thus may throw an error when the window is too small. I can't allow an error in `display-buffer' so I have to wrap that call in a `condition-case'. > Also I suggest keeping the common function name prefix "split-window-", > i.e. instead of `split-selected-window' to name it something like > "split-window-sensibly" or "split-window-with-thresholds". I've chosen `split-window-sensibly'. It also calls `split-window-vertically' and `split-window-horizontally' now. Please try the new patch - we're in pretest and I don't want to take too many chances. martin --------------030702030003060502010002 Content-Type: text/plain; name="window.el.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="window.el.diff" *** window.el.~1.179.~ 2009-04-29 07:50:42.078125000 +0200 --- window.el 2009-05-01 10:19:20.625000000 +0200 *************** *** 794,832 **** :type 'boolean :group 'windows) (defcustom split-height-threshold 80 "Minimum height of window to be split vertically. ! If the value is a number, `display-buffer' can split a window ! only if it has at least as many lines. If the value is nil, ! `display-buffer' cannot split a window vertically. ! ! If the window is the only window on its frame, `display-buffer' ! can split it regardless of this value." :type '(choice (const nil) (number :tag "lines")) :version "23.1" :group 'windows) (defcustom split-width-threshold 160 "Minimum width of window to be split horizontally. ! If the value is a number, `display-buffer' can split a window ! only if it has at least as many columns. If the value is nil, ! `display-buffer' cannot split a window horizontally." :type '(choice (const nil) (number :tag "columns")) :version "23.1" :group 'windows) - (defcustom split-window-preferred-function nil - "Function used by `display-buffer' to split windows. - If non-nil, a function called with a window as single argument - supposed to split that window and return the new window. If the - function returns nil the window is not split. - - If nil, `display-buffer' will split the window respecting the - values of `split-height-threshold' and `split-width-threshold'." - :type '(choice (const nil) (function :tag "Function")) - :version "23.1" - :group 'windows) - (defun window--splittable-p (window &optional horizontal) "Return non-nil if WINDOW can be split evenly. Optional argument HORIZONTAL non-nil means check whether WINDOW --- 794,831 ---- :type 'boolean :group 'windows) + (defcustom split-window-preferred-function 'split-window-sensibly + "Function called by `display-buffer' to split a window. + The window that shall be split is selected when this function is + called. The function is supposed to either return the new window + or nil if the window can (or shall) not be split." + :type '(choice + (function :tag "Function") + (const :tag "Split vertically" split-window-vertically) + (const :tag "Split horizontally" split-window-horizontally)) + :version "23.1" + :group 'windows) + (defcustom split-height-threshold 80 "Minimum height of window to be split vertically. ! If the value is a number, `split-window-sensibly' splits a window ! vertically only if it has at least as many lines. If the value ! is nil, it does not split a window vertically. If a window is ! the only window on its frame, it can be split regardless of the ! value of this variable." :type '(choice (const nil) (number :tag "lines")) :version "23.1" :group 'windows) (defcustom split-width-threshold 160 "Minimum width of window to be split horizontally. ! If the value is a number, `split-window-sensibly' splits a window ! only if it has at least as many columns. If the value is nil, it ! does not split a window horizontally." :type '(choice (const nil) (number :tag "columns")) :version "23.1" :group 'windows) (defun window--splittable-p (window &optional horizontal) "Return non-nil if WINDOW can be split evenly. Optional argument HORIZONTAL non-nil means check whether WINDOW *************** *** 882,911 **** (* 2 (max window-min-height (if mode-line-format 2 1)))))))))) (defun window--try-to-split-window (window) ! "Split WINDOW if it is splittable. ! See `window--splittable-p' for how to determine whether a window ! is splittable. If WINDOW can be split, return the value returned ! by `split-window' (or `split-window-preferred-function')." ! (when (and (window-live-p window) ! (not (frame-parameter (window-frame window) 'unsplittable))) ! (if (functionp split-window-preferred-function) ! ;; `split-window-preferred-function' is specified, so use it. ! (funcall split-window-preferred-function window) ! (or (and (window--splittable-p window) ! ;; Split window vertically. ! (split-window window)) ! (and (window--splittable-p window t) ! ;; Split window horizontally. ! (split-window window nil t)) ! (and (eq window (frame-root-window (window-frame window))) ! (not (window-minibuffer-p window)) ! ;; If WINDOW is the only window on its frame and not the ! ;; minibuffer window, attempt to split it vertically ! ;; disregarding the value of `split-height-threshold'. ! (let ((split-height-threshold 0)) ! (and (window--splittable-p window) ! (split-window window)))))))) (defun window--frame-usable-p (frame) "Return FRAME if it can be used to display a buffer." --- 881,922 ---- (* 2 (max window-min-height (if mode-line-format 2 1)))))))))) + (defun split-window-sensibly () + "\"Sensibly\" split the selected window. + Split selected window vertically or horizontally respecting the + values of `split-height-threshold' and `split-width-threshold'. + If the selected window is the only window on its frame, it may be + split disregarding the value of `split-height-threshold'. If the + window can be split, return the new window, nil otherwise. + + The default value of `split-window-preferred-function' is set to + this function." + (or (and (window--splittable-p (selected-window)) + ;; Split window vertically. + (split-window-vertically)) + (and (window--splittable-p (selected-window) t) + ;; Split window horizontally. + (split-window-horizontally)) + (and (eq (selected-window) (frame-root-window)) + (not (window-minibuffer-p)) + ;; If the selected window is the only window on its frame and + ;; is not the minibuffer window, try to split it vertically + ;; disregarding the value of `split-height-threshold'. + (let ((split-height-threshold 0)) + (and (window--splittable-p (selected-window)) + (split-window-vertically)))))) + (defun window--try-to-split-window (window) ! "Split WINDOW if it can be split. ! Return value returned by `split-window-preferred-function'." ! ;; Use `condition-case' since `split-window-preferred-function' might ! ;; throw an error. ! (condition-case nil ! (and (window-live-p window) ! (not (frame-parameter (window-frame window) 'unsplittable)) ! (with-selected-window window ! (funcall split-window-preferred-function))) ! (error nil))) (defun window--frame-usable-p (frame) "Return FRAME if it can be used to display a buffer." --------------030702030003060502010002--