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: [External] : bug#45474: Icomplete exhibiting in recursive minibuffer when it =?UTF-8?Q?shouldn=E2=80=99t?= Date: Thu, 22 Apr 2021 11:03:26 -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> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23122"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: Gregory Heytings , "45474@debbugs.gnu.org" <45474@debbugs.gnu.org>, Dario Gjorgjevski , Juri Linkov To: Drew Adams Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Apr 22 17:06:44 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 1lZaui-0005rt-0H for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 22 Apr 2021 17:06:44 +0200 Original-Received: from localhost ([::1]:44412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZauh-0007xM-3L for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 22 Apr 2021 11:06:43 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZas6-0006CG-Qz for bug-gnu-emacs@gnu.org; Thu, 22 Apr 2021 11:04:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:51956) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZas6-0005Y6-B9 for bug-gnu-emacs@gnu.org; Thu, 22 Apr 2021 11:04:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lZas6-0007bp-5H for bug-gnu-emacs@gnu.org; Thu, 22 Apr 2021 11:04:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 22 Apr 2021 15:04:02 +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.161910382429213 (code B ref 45474); Thu, 22 Apr 2021 15:04:02 +0000 Original-Received: (at 45474) by debbugs.gnu.org; 22 Apr 2021 15:03:44 +0000 Original-Received: from localhost ([127.0.0.1]:35266 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZaro-0007b6-DH for submit@debbugs.gnu.org; Thu, 22 Apr 2021 11:03:44 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:4860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZark-0007ap-SR for 45474@debbugs.gnu.org; Thu, 22 Apr 2021 11:03:43 -0400 Original-Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 3190D10050F; Thu, 22 Apr 2021 11:03:35 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 28964100216; Thu, 22 Apr 2021 11:03:33 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1619103813; bh=ypqczK1/1nawl37NvLaOrmJ4MlZB/Kku1TsapQpjwBQ=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=Jj/uc5tTmO5rR7q9UrUco3Rh8NRoEiTbvss6mYgjLGBtfuGGFJPkHrFHXODKvQtiR DF0gRfrhIYxC/51EMNNQwFZUjNpRPas2h6bRzI3aZ89+ZK5I7tIN9wzRFk8xyQCNvU kHoFK5EVOB7gkcuxzqm8w0URJH2wmR1TEErOTgcW5tAGbjSdps73qEoPmrnBT6HbNB 01hueSyEzudoWAQmv20L5+Mh73oVqyKq3T06PF5ui5Xv1gjE6ktCmJiOSFgXZNJGmi UpGkliDmVDuk8nsny8SBjij7Lw7SrKNFskixdGiL3gfjJGesb5IWF/D5eMKzNXN8NP 5i3b7fzgTIsrg== Original-Received: from alfajor (104-222-126-84.cpe.teksavvy.com [104.222.126.84]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id BB8FE120283; Thu, 22 Apr 2021 11:03:32 -0400 (EDT) In-Reply-To: (Drew Adams's message of "Sun, 18 Apr 2021 23:46:01 +0000") 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:204694 Archived-At: > And it was clear that I wasn't sure ("possibly > misunderstanding") what you meant by that phrase. Try the patch below, Stefan diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 7da3c39e6b9..ce136b90449 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -3884,13 +3884,7 @@ completing-read-default ;; `read-from-minibuffer' uses 1-based index. (1+ (cdr initial-input))))) - (let* ((minibuffer-completion-table collection) - (minibuffer-completion-predicate predicate) - ;; FIXME: Remove/rename this var, see the next one. - (minibuffer-completion-confirm (unless (eq require-match t) - require-match)) - (minibuffer--require-match require-match) - (base-keymap (if require-match + (let* ((base-keymap (if require-match minibuffer-local-must-match-map minibuffer-local-completion-map)) (keymap (if (memq minibuffer-completing-file-name '(nil lambda)) @@ -3903,8 +3897,17 @@ 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 () + (setq-local minibuffer-completion-table collection) + (setq-local minibuffer-completion-predicate predicate) + ;; FIXME: Remove/rename this var, see the next one. + (setq-local minibuffer-completion-confirm + (unless (eq require-match t) require-match)) + (setq-local minibuffer--require-match require-match)) + (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))