From: Gregory Heytings <gregory@heytings.org>
To: Juri Linkov <juri@linkov.net>
Cc: Dario Gjorgjevski <dario.gjorgjevski@gmail.com>, 45474@debbugs.gnu.org
Subject: bug#45474: Icomplete exhibiting in recursive minibuffer when it shouldn’t
Date: Thu, 15 Apr 2021 22:34:11 +0000 [thread overview]
Message-ID: <3ed97a9c530093aca93d@heytings.org> (raw)
In-Reply-To: <87fszrz21d.fsf@mail.linkov.net>
[-- Attachment #1: Type: text/plain, Size: 1416 bytes --]
>>> If the M-: is not in a recursive minibuffer, everything is OK since
>>> icomplete-simple-completing-p returns nil.
>>
>> Indeed; patch attached. Ideally this should be done inside
>> icomplete-minibuffer-setup, but if we did this (by checking
>> minibuffer-completing-symbol), it would prevent icomplete-mode from
>> being active in the opposite situation: M-: followed by C-x C-f.
>>
>> @@ -1754,7 +1754,9 @@ read--expression
>> (set-syntax-table emacs-lisp-mode-syntax-table)
>> (add-hook 'completion-at-point-functions
>> #'elisp-completion-at-point nil t)
>> - (run-hooks 'eval-expression-minibuffer-setup-hook))
>> + (run-hooks 'eval-expression-minibuffer-setup-hook)
>> + ;; if we enter a recursive minibuffer, disable icomplete (bug#45474)
>> + (setq-local icomplete-mode nil))
>
> Is this really specific only to read--expression? I can reproduce the
> same issue with any command that doesn't use completion, e.g. C-x C-f
> C-x f.
>
Indeed, but the bug report was only about read-expression. It's far more
annoying to see completion candidates when you want to type a complete
expression than when you just have to enter a short argument.
Anyway, given that you asked for it, here's a more general solution. I
did not check all places where read-from-minibuffer is used, but adapting
them is straightforward.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-diff; name=Make-it-possible-to-disable-icomplete-mode-in-recurs.patch, Size: 4658 bytes --]
From 7fc38f2a66f5545c276836d62a7e3a8669c3eb10 Mon Sep 17 00:00:00 2001
From: Gregory Heytings <gregory@heytings.org>
Date: Thu, 15 Apr 2021 22:27:08 +0000
Subject: [PATCH] Make it possible to disable icomplete-mode in recursive
minibuffers
* lisp/icomplete.el (minibuffer-disable-icomplete-mode): New internal
variable.
(icomplete-minibuffer-setup): Disable icomplete-mode when
minibuffer-disable-icomplete-mode is non-nil
* lisp/subr.el (read-number, read-char-from-minibuffer, y-or-n-p): Use it.
* lisp/simple.el (read--expression): Use it.
---
lisp/icomplete.el | 5 +++++
lisp/simple.el | 3 +++
lisp/subr.el | 17 ++++++++++++-----
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index d5b6f76d7b..551b8bdc4a 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -442,10 +442,15 @@ icomplete-simple-completing-p
(eq icomplete-with-completion-tables t)
(member table icomplete-with-completion-tables))))))
+(defvar minibuffer-disable-icomplete-mode nil)
+
;;;_ > icomplete-minibuffer-setup ()
(defun icomplete-minibuffer-setup ()
"Run in minibuffer on activation to establish incremental completion.
Usually run by inclusion in `minibuffer-setup-hook'."
+ (when minibuffer-disable-icomplete-mode
+ (setq-local icomplete-mode nil)
+ (setq minibuffer-disable-icomplete-mode nil))
(when (and icomplete-mode (icomplete-simple-completing-p))
(setq-local icomplete--initial-input (icomplete--field-string))
(setq-local completion-show-inline-help nil)
diff --git a/lisp/simple.el b/lisp/simple.el
index 999755a642..9626b3605f 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1739,6 +1739,8 @@ eval-expression-print-format
(defvar eval-expression-minibuffer-setup-hook nil
"Hook run by `eval-expression' when entering the minibuffer.")
+(defvar minibuffer-disable-icomplete-mode)
+
(defun read--expression (prompt &optional initial-contents)
"Read an Emacs Lisp expression from the minibuffer.
@@ -1755,6 +1757,7 @@ read--expression
(add-hook 'completion-at-point-functions
#'elisp-completion-at-point nil t)
(run-hooks 'eval-expression-minibuffer-setup-hook))
+ (setq minibuffer-disable-icomplete-mode t)
(read-from-minibuffer prompt initial-contents
read-expression-map t
'read-expression-history))))
diff --git a/lisp/subr.el b/lisp/subr.el
index c2be26a15f..bc25fe234f 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2794,6 +2794,8 @@ read-passwd
(defvar read-number-history nil
"The default history for the `read-number' function.")
+(defvar minibuffer-disable-icomplete-mode)
+
(defun read-number (prompt &optional default hist)
"Read a numeric value in the minibuffer, prompting with PROMPT.
DEFAULT specifies a default value to return if the user just types RET.
@@ -2812,6 +2814,7 @@ read-number
prompt t t))))
(while
(progn
+ (setq minibuffer-disable-icomplete-mode t)
(let ((str (read-from-minibuffer
prompt nil nil nil (or hist 'read-number-history)
(when default
@@ -3052,8 +3055,10 @@ read-char-from-minibuffer
;; Protect this-command when called from pre-command-hook (bug#45029)
(this-command this-command)
(result
- (read-from-minibuffer prompt nil map nil
- (or history 'empty-history)))
+ (progn
+ (setq minibuffer-disable-icomplete-mode t)
+ (read-from-minibuffer prompt nil map nil
+ (or history 'empty-history))))
(char
(if (> (length result) 0)
;; We have a string (with one character), so return the first one.
@@ -3247,9 +3252,11 @@ y-or-n-p
map))
;; Protect this-command when called from pre-command-hook (bug#45029)
(this-command this-command)
- (str (read-from-minibuffer
- prompt nil keymap nil
- (or y-or-n-p-history-variable 'empty-history))))
+ (str (progn
+ (setq minibuffer-disable-icomplete-mode t)
+ (read-from-minibuffer
+ prompt nil keymap 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
--
2.30.2
next prev parent reply other threads:[~2021-04-15 22:34 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-27 17:44 bug#45474: Icomplete exhibiting in recursive minibuffer when it shouldn’t Dario Gjorgjevski
2021-04-15 17:40 ` Gregory Heytings
2021-04-15 21:11 ` Juri Linkov
2021-04-15 22:34 ` Gregory Heytings [this message]
2021-04-16 0:03 ` Gregory Heytings
2021-04-16 16:34 ` Juri Linkov
2021-04-16 16:55 ` Gregory Heytings
2021-04-17 20:49 ` Juri Linkov
2021-04-17 21:35 ` Gregory Heytings
2021-04-17 21:58 ` Stefan Monnier
2021-04-17 22:16 ` Gregory Heytings
2021-04-18 14:44 ` Stefan Monnier
2021-04-18 22:23 ` Gregory Heytings
2021-04-19 1:26 ` Stefan Monnier
2021-04-19 12:14 ` Gregory Heytings
2021-04-19 15:57 ` Stefan Monnier
2021-04-19 20:20 ` Gregory Heytings
2021-04-17 23:21 ` bug#45474: [External] : " Drew Adams
2021-04-18 3:59 ` Stefan Monnier
2021-04-18 4:04 ` Drew Adams
2021-04-18 5:08 ` Stefan Monnier
2021-04-18 15:42 ` Drew Adams
2021-04-18 18:35 ` Stefan Monnier
2021-04-18 20:11 ` Drew Adams
2021-04-18 20:53 ` Stefan Monnier
2021-04-18 23:46 ` Drew Adams
2021-04-22 15:03 ` Stefan Monnier
2021-04-19 18:16 ` Juri Linkov
2021-04-19 21:42 ` Stefan Monnier
2021-04-20 19:00 ` Gregory Heytings
2021-04-22 13:56 ` Stefan Monnier
2021-04-22 14:08 ` Gregory Heytings
2021-04-20 19:01 ` Juri Linkov
2021-04-22 13:54 ` Stefan Monnier
2021-04-22 14:13 ` Stefan Monnier
2021-04-22 14:18 ` Gregory Heytings
2021-04-22 15:18 ` Gregory Heytings
2021-04-22 18:36 ` Stefan Monnier
2021-04-22 19:04 ` Gregory Heytings
2021-04-22 19:59 ` Gregory Heytings
2021-04-22 20:57 ` Gregory Heytings
2021-04-22 23:24 ` Stefan Monnier
2021-04-23 6:06 ` Eli Zaretskii
2021-04-23 13:12 ` Stefan Monnier
2021-04-23 13:19 ` Eli Zaretskii
2021-04-23 15:18 ` Stefan Monnier
2021-04-23 17:37 ` Eli Zaretskii
2021-04-23 6:59 ` Gregory Heytings
2021-04-23 13:21 ` Stefan Monnier
2021-04-23 13:45 ` Gregory Heytings
2021-04-23 15:35 ` Stefan Monnier
2021-04-23 15:58 ` Gregory Heytings
2021-04-23 16:36 ` Juri Linkov
2021-04-23 16:55 ` Stefan Monnier
2021-04-23 18:13 ` Gregory Heytings
2021-04-23 20:24 ` Stefan Monnier
2021-04-23 21:36 ` Gregory Heytings
2021-04-23 21:54 ` Stefan Monnier
2021-04-24 8:44 ` Gregory Heytings
2021-05-01 19:34 ` Stefan Monnier
2021-05-03 8:40 ` Gregory Heytings
2022-06-07 12:04 ` Lars Ingebrigtsen
2021-04-22 21:57 ` Juri Linkov
2021-04-23 15:53 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3ed97a9c530093aca93d@heytings.org \
--to=gregory@heytings.org \
--cc=45474@debbugs.gnu.org \
--cc=dario.gjorgjevski@gmail.com \
--cc=juri@linkov.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).