From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#30314: Define aliases for window display actions Date: Mon, 05 Feb 2018 00:30:29 +0200 Organization: LINKOV.NET Message-ID: <871si0qtfe.fsf@mail.linkov.net> References: <87mv0tsnk8.fsf@mail.linkov.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1517783425 28078 195.159.176.226 (4 Feb 2018 22:30:25 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 4 Feb 2018 22:30:25 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) To: 30314@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Feb 04 23:30:21 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eiSnb-0006Se-76 for geb-bug-gnu-emacs@m.gmane.org; Sun, 04 Feb 2018 23:30:11 +0100 Original-Received: from localhost ([::1]:47793 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eiSpc-0002fH-5L for geb-bug-gnu-emacs@m.gmane.org; Sun, 04 Feb 2018 17:32:16 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eiSpR-0002dZ-JF for bug-gnu-emacs@gnu.org; Sun, 04 Feb 2018 17:32:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eiSpO-0003wM-7V for bug-gnu-emacs@gnu.org; Sun, 04 Feb 2018 17:32:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:49547) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eiSpO-0003w9-3O for bug-gnu-emacs@gnu.org; Sun, 04 Feb 2018 17:32:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eiSpN-0003pG-Tg for bug-gnu-emacs@gnu.org; Sun, 04 Feb 2018 17:32:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 04 Feb 2018 22:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30314 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 30314-submit@debbugs.gnu.org id=B30314.151778351414692 (code B ref 30314); Sun, 04 Feb 2018 22:32:01 +0000 Original-Received: (at 30314) by debbugs.gnu.org; 4 Feb 2018 22:31:54 +0000 Original-Received: from localhost ([127.0.0.1]:57444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eiSpG-0003ou-9d for submit@debbugs.gnu.org; Sun, 04 Feb 2018 17:31:54 -0500 Original-Received: from sub3.mail.dreamhost.com ([69.163.253.7]:60781 helo=homiemail-a20.g.dreamhost.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eiSpE-0003ol-7J for 30314@debbugs.gnu.org; Sun, 04 Feb 2018 17:31:52 -0500 Original-Received: from homiemail-a20.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a20.g.dreamhost.com (Postfix) with ESMTP id 7C7D37EC064 for <30314@debbugs.gnu.org>; Sun, 4 Feb 2018 14:31:51 -0800 (PST) Original-Received: from localhost.linkov.net (m91-129-107-8.cust.tele2.ee [91.129.107.8]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: jurta@jurta.org) by homiemail-a20.g.dreamhost.com (Postfix) with ESMTPSA id 99D757EC060 for <30314@debbugs.gnu.org>; Sun, 4 Feb 2018 14:31:50 -0800 (PST) In-Reply-To: <87mv0tsnk8.fsf@mail.linkov.net> (Juri Linkov's message of "Wed, 31 Jan 2018 23:52:55 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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" Xref: news.gmane.org gmane.emacs.bugs:142915 Archived-At: > Instead of duplicating the same list of actions in many places > like in bug#30016: > > (pop-to-buffer buf `((display-buffer--maybe-same-window > display-buffer-reuse-window > display-buffer--maybe-pop-up-frame-or-window > display-buffer-at-bottom) > ,(if temp-buffer-resize-mode > '(window-height . resize-temp-buffer-window) > '(window-height . fit-window-to-buffer)) > ,(when temp-buffer-resize-mode > '(preserve-size . (nil . t))))) > > I propose to introduce the concept of display action aliases to group > several actions under one name and use just this short name where needed. I realized that aliases can be implemented simply by defining a new composite action function: diff --git a/lisp/files.el b/lisp/files.el index 414eb3f..22d8247 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -3315,15 +3315,7 @@ hack-local-variables-confirm ;; Display the buffer and read a choice. (save-window-excursion - (pop-to-buffer buf `((display-buffer--maybe-same-window - display-buffer-reuse-window - display-buffer--maybe-pop-up-frame-or-window - display-buffer-at-bottom) - ,(if temp-buffer-resize-mode - '(window-height . resize-temp-buffer-window) - '(window-height . fit-window-to-buffer)) - ,(when temp-buffer-resize-mode - '(preserve-size . (nil . t))))) + (pop-to-buffer buf '(display-buffer-composite-at-bottom)) (let* ((exit-chars '(?y ?n ?\s ?\C-g ?\C-v)) (prompt (format "Please type %s%s: " (if offer-save "y, n, or !" "y or n") @@ -6929,15 +6921,7 @@ save-buffers-kill-emacs (or (not active) (with-displayed-buffer-window (get-buffer-create "*Process List*") - `((display-buffer--maybe-same-window - display-buffer-reuse-window - display-buffer--maybe-pop-up-frame-or-window - display-buffer-at-bottom) - ,(if temp-buffer-resize-mode - '(window-height . resize-temp-buffer-window) - '(window-height . fit-window-to-buffer)) - ,(when temp-buffer-resize-mode - '(preserve-size . (nil . t)))) + '(display-buffer-composite-at-bottom) #'(lambda (window _value) (with-selected-window window (unwind-protect diff --git a/lisp/window.el b/lisp/window.el index abd1a68..d9a0bc8 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -7360,6 +7360,20 @@ display-buffer-below-selected (window--display-buffer buffer window 'reuse alist display-buffer-mark-dedicated))))) +(defun display-buffer-composite-at-bottom (buffer alist) + (let ((alist (append alist `(,(if temp-buffer-resize-mode + '(window-height . resize-temp-buffer-window) + '(window-height . fit-window-to-buffer)) + ,(when temp-buffer-resize-mode + '(preserve-size . (nil . t))))))) + (or (display-buffer--maybe-same-window buffer alist) + (display-buffer-reuse-window buffer alist) + (and (if (eq pop-up-frames 'graphic-only) + (display-graphic-p) + pop-up-frames) + (display-buffer-pop-up-frame buffer alist)) + (display-buffer-at-bottom buffer alist)))) + (defun display-buffer-at-bottom (buffer alist) "Try displaying BUFFER in a window at the bottom of the selected frame. This either reuses such a window provided it shows BUFFER