From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#45474: Icomplete exhibiting in recursive minibuffer when it =?UTF-8?Q?shouldn=E2=80=99t?= Date: Mon, 19 Apr 2021 17:42:02 -0400 Message-ID: References: <3ed97a9c53e0a5d4fef8@heytings.org> <87fszrz21d.fsf@mail.linkov.net> <3ed97a9c530093aca93d@heytings.org> <7dee3f4235d331cab291@heytings.org> <87r1jatd34.fsf@mail.linkov.net> <7dee3f423551aaf318cb@heytings.org> <87im4kzlfm.fsf@mail.linkov.net> <1869622e16546eafd9df@heytings.org> <871rb6np5j.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11473"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: Gregory Heytings , Dario Gjorgjevski , 45474@debbugs.gnu.org To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Apr 19 23:43:10 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lYbfi-0002r4-5N for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 19 Apr 2021 23:43:10 +0200 Original-Received: from localhost ([::1]:35110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYbfh-0005Ie-9M for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 19 Apr 2021 17:43:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYbfa-0005H8-D0 for bug-gnu-emacs@gnu.org; Mon, 19 Apr 2021 17:43:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:40732) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYbfa-0003iJ-0J for bug-gnu-emacs@gnu.org; Mon, 19 Apr 2021 17:43:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lYbfZ-0000Hv-TT for bug-gnu-emacs@gnu.org; Mon, 19 Apr 2021 17:43:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 19 Apr 2021 21:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45474 X-GNU-PR-Package: emacs Original-Received: via spool by 45474-submit@debbugs.gnu.org id=B45474.16188685401056 (code B ref 45474); Mon, 19 Apr 2021 21:43:01 +0000 Original-Received: (at 45474) by debbugs.gnu.org; 19 Apr 2021 21:42:20 +0000 Original-Received: from localhost ([127.0.0.1]:52278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYbeq-0000Gv-O3 for submit@debbugs.gnu.org; Mon, 19 Apr 2021 17:42:20 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:23205) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYbel-0000Ge-GE for 45474@debbugs.gnu.org; Mon, 19 Apr 2021 17:42:15 -0400 Original-Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id B07BD4411AD; Mon, 19 Apr 2021 17:42:05 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 176F1441195; Mon, 19 Apr 2021 17:42:04 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1618868524; bh=vK9nAHNSc1xFAJq2+//FuLCcQZ8HOE7DctNx2IRE+bc=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=D5UOyUI2xmge9kKT3gKcTj726LhPdu51F0gvmio38cjHL3LKNyElyucTDAmVW5j/I SQACNiyb1zK3LCLdSJzpTFha7Aia6mDQzpttt7rnp681ybgprqgiMyerNzsBS6bktM Csg+1qUzeSE+Sp67jBGksIpVxDKjCSUC1NkeDMAWn5uxMUE7/oDrdWNrstDxxiCpKX iuhag8yu8y5L1qLonuZEHsQ40lS4gm5F0GXSk2wU359ukpzM15WFMTes9vAuf0bmOt OvoSKCrcSVzZPaRfFMmJdH7/SdXCEEj33x2KNbTUyZYpat3T2HmS5+tQWnXVveIp3L DZElXanpcUJoQ== Original-Received: from alfajor (104-222-126-84.cpe.teksavvy.com [104.222.126.84]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id C4205120257; Mon, 19 Apr 2021 17:42:03 -0400 (EDT) In-Reply-To: <871rb6np5j.fsf@mail.linkov.net> (Juri Linkov's message of "Mon, 19 Apr 2021 21:16:18 +0300") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:204515 Archived-At: > but then later you posted a different patch. Anyway FWIW here is > a safer workable workaround that implements your first suggestion > and sets a new explicit buffer-local variable in completing minibuffers, > so modes that need to distinguish such minibuffers could check it. I combined your idea with that of Gregory for the patch below. It's far from perfect, but I think it strikes a good balance of simplicity, preserving compatibility, and moving in the right direction. WDYT? > Maybe this minibuffer-with-setup-hook could be moved even to > 'completing-read'? Because of the fundamentally broken&messy way `minibuffer-with-setup-hook` works, it's best to keep it as close as possible to the call to `read-from-minibuffer`, IMO. Stefan diff --git a/lisp/icomplete.el b/lisp/icomplete.el index 91bbb600136..df9c5241234 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -400,7 +400,9 @@ icomplete-mode (add-hook 'minibuffer-setup-hook #'icomplete-minibuffer-setup))) (defun icomplete--completion-table () - (if (window-minibuffer-p) minibuffer-completion-table + (if (window-minibuffer-p) + (if (local-variable-p 'minibuffer-completion-table) + minibuffer-completion-table) (or (nth 2 completion-in-region--data) (message "In %S (w=%S): %S" (current-buffer) (selected-window) (window-minibuffer-p))))) diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index c19f9096290..04fbd092c27 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -3857,8 +3857,11 @@ completing-read-default ;; in minibuffer-local-filename-completion-map can ;; override bindings in base-keymap. base-keymap))) - (result (read-from-minibuffer prompt initial-input keymap - nil hist def inherit-input-method))) + (result + (minibuffer-with-setup-hook + (lambda () (make-local-variable 'minibuffer-completion-table)) + (read-from-minibuffer prompt initial-input keymap + nil hist def inherit-input-method)))) (when (and (equal result "") def) (setq result (if (consp def) (car def) def))) result))