From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#38076: Using minibuffer for y-or-n-p Date: Wed, 06 Nov 2019 00:54:37 +0200 Organization: LINKOV.NET Message-ID: <87r22m53yq.fsf_-_@mail.linkov.net> References: <20191026101407.GA17424@ACM> <87o8y3d4ur.fsf@gnus.org> <87mudl3l83.fsf@mail.linkov.net> <87v9s9b12x.fsf@gnus.org> <87ftjctsx5.fsf@mail.linkov.net> <87k18n233r.fsf@gnus.org> <87pnifcdzd.fsf@mail.linkov.net> <87d0efxfxg.fsf@gnus.org> <875zk57sqk.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="42113"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) Cc: stefan monnier To: 38076@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Nov 05 23:59:30 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iS7nN-000ApA-CX for geb-bug-gnu-emacs@m.gmane.org; Tue, 05 Nov 2019 23:59:29 +0100 Original-Received: from localhost ([::1]:51324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iS7nM-0007Y6-45 for geb-bug-gnu-emacs@m.gmane.org; Tue, 05 Nov 2019 17:59:28 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33511) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iS7my-00079O-8w for bug-gnu-emacs@gnu.org; Tue, 05 Nov 2019 17:59:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iS7mw-0002Kj-Bb for bug-gnu-emacs@gnu.org; Tue, 05 Nov 2019 17:59:04 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:58599) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iS7mw-0002Kc-7c for bug-gnu-emacs@gnu.org; Tue, 05 Nov 2019 17:59:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iS7mv-0004xn-Q7; Tue, 05 Nov 2019 17:59:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: monnier@iro.umontreal.ca, bug-gnu-emacs@gnu.org Resent-Date: Tue, 05 Nov 2019 22:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38076 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org X-Debbugs-Original-Xcc: stefan monnier Original-Received: via spool by submit@debbugs.gnu.org id=B.157299472619049 (code B ref -1); Tue, 05 Nov 2019 22:59:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 5 Nov 2019 22:58:46 +0000 Original-Received: from localhost ([127.0.0.1]:39185 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iS7mf-0004xA-Ab for submit@debbugs.gnu.org; Tue, 05 Nov 2019 17:58:45 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:51392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iS7mc-0004x2-TQ for submit@debbugs.gnu.org; Tue, 05 Nov 2019 17:58:43 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33115) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iS7ma-00076K-RT for bug-gnu-emacs@gnu.org; Tue, 05 Nov 2019 17:58:42 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iS7mY-0001iH-Nn for bug-gnu-emacs@gnu.org; Tue, 05 Nov 2019 17:58:40 -0500 Original-Received: from crocodile.birch.relay.mailchannels.net ([23.83.209.45]:31566) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iS7mY-0001fu-A4 for bug-gnu-emacs@gnu.org; Tue, 05 Nov 2019 17:58:38 -0500 X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 8CE1C342180 for ; Tue, 5 Nov 2019 22:58:36 +0000 (UTC) Original-Received: from pdx1-sub0-mail-a64.g.dreamhost.com (100-96-14-250.trex.outbound.svc.cluster.local [100.96.14.250]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 08B6A3420BC for ; Tue, 5 Nov 2019 22:58:36 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from pdx1-sub0-mail-a64.g.dreamhost.com ([TEMPUNAVAIL]. [64.90.62.162]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.18.5); Tue, 05 Nov 2019 22:58:36 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|jurta@jurta.org X-MailChannels-Auth-Id: dreamhost X-Oafish-White: 030f564c403fd0fb_1572994716434_2387425792 X-MC-Loop-Signature: 1572994716434:1881170825 X-MC-Ingress-Time: 1572994716434 Original-Received: from pdx1-sub0-mail-a64.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a64.g.dreamhost.com (Postfix) with ESMTP id 363447F512 for ; Tue, 5 Nov 2019 14:58:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=linkov.net; h=from:to :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=linkov.net; bh=u63KV0nGDqubDuwBVG63gy2pqNw=; b= vcuEpde4+JhkJ2sHSGvdDP0OSxro+8tp0Z9KdmxgU4gKhrJlJgpXcDlc0/u29DC1 MJKOYcUMvZpWKuBoCD+0oUXMX2JYfatZWkWKKSv/EQKW5BvKhX0yrhwr8v+WwMEa 77zD6+yR6kwLC9oWVsPsXDout8gj5Q7i3fdfJFwRbUc= Original-Received: from mail.jurta.org (m91-129-101-77.cust.tele2.ee [91.129.101.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: jurta@jurta.org) by pdx1-sub0-mail-a64.g.dreamhost.com (Postfix) with ESMTPSA id D05767F51D for ; Tue, 5 Nov 2019 14:58:32 -0800 (PST) X-DH-BACKEND: pdx1-sub0-mail-a64 In-Reply-To: (Stefan Monnier's message of "Wed, 30 Oct 2019 22:00:40 -0400") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] 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: 209.51.188.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:170991 Archived-At: --=-=-= Content-Type: text/plain X-Debbugs-CC: Stefan Monnier Tags: patch >> query-replace-map needs to be translated to another keymap >> where the same characters from 'query-replace-map' >> run real commands, not intermediate symbols. > > E.g. > > (defvar foo-remapping-map > (let ((map (make-sparse-keymap))) > (define-key map [remap ask] '...) > ... > map)) > > and then > > ... (make-composed-keymap query-replace-map foo-remapping-map) .. This also required adding the same feature that supported recentering/scrolling in y-or-n-p to the minibuffer as well. A large part of old implementation of y-or-n-p handled recentering/scrolling. Now the minibuffer supports the same commands by using the new macro 'with-minibuffer-selected-window'. window.c was changed to use the 'lambda' value for MINIBUF arg of 'next-window', so minibuffer-scroll-other-window/minibuffer-scroll-other-window-down doesn't try to scroll the minibuffer window. A new history variable 'y-or-n-p-history-variable' is nil by default, so no history is used in 'y-or-n-p' minibuffer. This patch was tested with various commands that use 'y-or-n-p' and seems to work fine: --=-=-= Content-Type: text/x-diff; charset=iso-8859-1 Content-Disposition: inline; filename=y-or-n-p-minibuffer.patch Content-Transfer-Encoding: quoted-printable diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 43dd277a2e..0c55954b02 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -2236,6 +2236,13 @@ completion-help-at-point (let ((map minibuffer-local-map)) (define-key map "\C-g" 'abort-recursive-edit) (define-key map "\M-<" 'minibuffer-beginning-of-buffer) + + (define-key map [remap recenter-top-bottom] 'minibuffer-recenter-top-b= ottom) + (define-key map [remap scroll-up-command] 'minibuffer-scroll-up-comman= d) + (define-key map [remap scroll-down-command] 'minibuffer-scroll-down-co= mmand) + (define-key map [remap scroll-other-window] 'minibuffer-scroll-other-w= indow) + (define-key map [remap scroll-other-window-down] 'minibuffer-scroll-ot= her-window-down) + (define-key map "\r" 'exit-minibuffer) (define-key map "\n" 'exit-minibuffer)) =20 @@ -3670,6 +3677,46 @@ minibuffer-beginning-of-buffer (when (and arg (not (consp arg))) (forward-line 1))) =20 +(defmacro with-minibuffer-selected-window (&rest body) + "Execute the forms in BODY from the minibuffer in its original window. +When used in a minibuffer window, select the window selected just before +minibuffer window was selected, and execute the forms." + (declare (indent 0) (debug t)) + `(let ((window (minibuffer-selected-window))) + (when window + (with-selected-window window + ,@body)))) + +(defun minibuffer-recenter-top-bottom (&optional arg) + "Run `recenter-top-bottom' from minibuffer in original window." + (interactive "P") + (with-minibuffer-selected-window + (recenter-top-bottom arg))) + +(defun minibuffer-scroll-up-command (&optional arg) + "Run `scroll-up-command' from minibuffer in original window." + (interactive "^P") + (with-minibuffer-selected-window + (scroll-up-command arg))) + +(defun minibuffer-scroll-down-command (&optional arg) + "Run `scroll-down-command' from minibuffer in original window." + (interactive "^P") + (with-minibuffer-selected-window + (scroll-down-command arg))) + +(defun minibuffer-scroll-other-window (&optional arg) + "Run `scroll-other-window' from minibuffer in original window." + (interactive "P") + (with-minibuffer-selected-window + (scroll-other-window arg))) + +(defun minibuffer-scroll-other-window-down (&optional arg) + "Run `scroll-other-window-down' from minibuffer in original window." + (interactive "^P") + (with-minibuffer-selected-window + (scroll-other-window-down arg))) + (provide 'minibuffer) =20 ;;; minibuffer.el ends here diff --git a/lisp/subr.el b/lisp/subr.el index 03cf3da278..0a8a505b70 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -2668,6 +2668,66 @@ sit-for ;; Behind display-popup-menus-p test. (declare-function x-popup-dialog "menu.c" (position contents &optional h= eader)) =20 +(defvar y-or-n-p-history-variable nil + "History list symbol to add `y-or-n-p' answers to.") + +(defvar y-or-n-p-map + (let ((map (make-sparse-keymap))) + (set-keymap-parent map minibuffer-local-map) + + (define-key map [remap act] 'y-or-n-p-insert-y) + (define-key map [remap act-and-show] 'y-or-n-p-insert-y) + (define-key map [remap act-and-exit] 'y-or-n-p-insert-y) + (define-key map [remap automatic] 'y-or-n-p-insert-y) + + (define-key map [remap skip] 'y-or-n-p-insert-n) + + (define-key map [remap help] 'y-or-n-p-insert-other) + (define-key map [remap backup] 'y-or-n-p-insert-other) + (define-key map [remap undo] 'y-or-n-p-insert-other) + (define-key map [remap undo-all] 'y-or-n-p-insert-other) + (define-key map [remap edit] 'y-or-n-p-insert-other) + (define-key map [remap edit-replacement] 'y-or-n-p-insert-other) + (define-key map [remap delete-and-edit] 'y-or-n-p-insert-other) + (define-key map [remap ignore] 'y-or-n-p-insert-other) + (define-key map [remap self-insert-command] 'y-or-n-p-insert-other) + + (define-key map [remap recenter] 'minibuffer-recenter-top-bottom) + + (define-key map [remap quit] 'abort-recursive-edit) + (define-key map [remap exit] 'abort-recursive-edit) + (define-key map [remap exit-prefix] 'abort-recursive-edit) + (define-key map [escape] 'abort-recursive-edit) + + map) + "Keymap that defines additional bindings for `y-or-n-p' answers.") + +(defun y-or-n-p-insert-y () + "Insert the answer \"y\" and exit the minibuffer of `y-or-n-p'. +Discard all input in a minibuffer before inserting." + (interactive) + (delete-minibuffer-contents) + (insert "y") + (exit-minibuffer)) + +(defun y-or-n-p-insert-n () + "Insert the answer \"n\" and exit the minibuffer of `y-or-n-p'. +Discard all input in a minibuffer before inserting." + (interactive) + (delete-minibuffer-contents) + (insert "n") + (exit-minibuffer)) + +(defun y-or-n-p-insert-other () + "Handle inserting of other answers in the minibuffer of `y-or-n-p'." + (interactive) + (delete-minibuffer-contents) + (ding) + (minibuffer-message "Please answer y or n.") + (sit-for 2)) + +(defvar empty-history) + (defun y-or-n-p (prompt) "Ask user a \"y or n\" question. Return t if answer is \"y\" and nil if it is \"n\". @@ -2683,16 +2743,13 @@ y-or-n-p case, the useful bindings are `act', `skip', `recenter', `scroll-up', `scroll-down', and `quit'. An `act' response means yes, and a `skip' response means no. -A `quit' response means to invoke `keyboard-quit'. +A `quit' response means to invoke `abort-recursive-edit'. If the user enters `recenter', `scroll-up', or `scroll-down' responses, perform the requested window recentering or scrolling and ask again. =20 Under a windowing system a dialog box will be used if `last-nonmenu-even= t' is nil and `use-dialog-box' is non-nil." - ;; =A1Beware! when I tried to edebug this code, Emacs got into a weird= state - ;; where all the keys were unbound (i.e. it somehow got triggered - ;; within read-key, apparently). I had to kill it. (let ((answer 'recenter) (padded (lambda (prompt &optional dialog) (let ((l (length prompt))) @@ -2718,36 +2775,13 @@ y-or-n-p answer (x-popup-dialog t `(,prompt ("Yes" . act) ("No" . skip))))) (t (setq prompt (funcall padded prompt)) - (while - (let* ((scroll-actions '(recenter scroll-up scroll-down - scroll-other-window scroll-other-window-down)) - (key - (let ((cursor-in-echo-area t)) - (when minibuffer-auto-raise - (raise-frame (window-frame (minibuffer-window)))) - (read-key (propertize (if (memq answer scroll-action= s) - prompt - (concat "Please answer y or = n. " - prompt)) - 'face 'minibuffer-prompt))))) - (setq answer (lookup-key query-replace-map (vector key) t)) - (cond - ((memq answer '(skip act)) nil) - ((eq answer 'recenter) - (recenter) t) - ((eq answer 'scroll-up) - (ignore-errors (scroll-up-command)) t) - ((eq answer 'scroll-down) - (ignore-errors (scroll-down-command)) t) - ((eq answer 'scroll-other-window) - (ignore-errors (scroll-other-window)) t) - ((eq answer 'scroll-other-window-down) - (ignore-errors (scroll-other-window-down)) t) - ((or (memq answer '(exit-prefix quit)) (eq key ?\e)) - (signal 'quit nil) t) - (t t))) - (ding) - (discard-input)))) + (let* ((empty-history '()) + (str (read-from-minibuffer + prompt nil + (make-composed-keymap y-or-n-p-map query-replace-map) + nil + (or y-or-n-p-history-variable 'empty-history)))) + (setq answer (if (member str '("y" "Y")) 'act 'skip))))) (let ((ret (eq answer 'act))) (unless noninteractive (message "%s%c" prompt (if ret ?y ?n))) diff --git a/src/window.c b/src/window.c index 0fa0bdf7b9..c01f5c4aa3 100644 --- a/src/window.c +++ b/src/window.c @@ -6253,12 +6253,12 @@ DEFUN ("other-window-for-scrolling", Fother_windo= w_for_scrolling, Sother_window_ { /* Nothing specified; look for a neighboring window on the same frame. */ - window =3D Fnext_window (selected_window, Qnil, Qnil); + window =3D Fnext_window (selected_window, Qlambda, Qnil); =20 if (EQ (window, selected_window)) /* That didn't get us anywhere; look for a window on another visible frame on the current terminal. */ - window =3D Fnext_window (window, Qnil, Qvisible); + window =3D Fnext_window (window, Qlambda, Qvisible); } =20 CHECK_LIVE_WINDOW (window); --=-=-=--