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.devel Subject: Re: [PATCH] (icomplete-vertical-mode): Add support for affixations and, annotations Date: Sun, 23 May 2021 23:23:36 -0400 Message-ID: References: <87zgwlb4xc.fsf@gmail.com> <87eedxrqz4.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="17820"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: =?windows-1252?B?Sm/jbyBU4XZvcmE=?= , Daniel Mendler , emacs-devel@gnu.org To: Juri Linkov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon May 24 05:24:25 2021 Return-path: Envelope-to: ged-emacs-devel@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 1ll1Ca-0004NJ-Tc for ged-emacs-devel@m.gmane-mx.org; Mon, 24 May 2021 05:24:25 +0200 Original-Received: from localhost ([::1]:60406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ll1CY-0001FY-QB for ged-emacs-devel@m.gmane-mx.org; Sun, 23 May 2021 23:24:22 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ll1Bv-0000YA-MJ for emacs-devel@gnu.org; Sun, 23 May 2021 23:23:43 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:56943) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ll1Bt-0004dv-5M for emacs-devel@gnu.org; Sun, 23 May 2021 23:23:42 -0400 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 990FD808A3; Sun, 23 May 2021 23:23:39 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 0EE0C8065D; Sun, 23 May 2021 23:23:38 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1621826618; bh=GpOp7C2ZJYRHHBVrAi1QAQBncjVZG92mpKYqJibraX8=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=eTP2iJS0+DofWMxburId//kaKlqf8ASyVV9IjJKyvktrzwpYUhQxGpemtl6Uid5Dr LgJrZj5t2RFvg+OzsEw7n6fUz3CTdpxv/VTqiE8+fN/WSIUMruzMvZVPm7eKexMEZO 5GkaMc8t3xyC9oIWg6hJjO7pCvlC+yaipipxIuzLM8DLRo7gYrgrpEohR5nS9iDUFk M0sOp9wz/LXK4keOoknOpjRvRe9hOmdkjdzSlJ087l0epQqN0PHAdd7d0crHtnwmNu 7HNHRZzKxHbtlsz0vDSty1AUa4kKz0xLf26dNiELVo1a2KksvvAK1YlSpzia2gr2c4 d/qIWs30ZRMtQ== Original-Received: from alfajor (69-196-163-239.dsl.teksavvy.com [69.196.163.239]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id C5207120AB3; Sun, 23 May 2021 23:23:37 -0400 (EDT) In-Reply-To: <87eedxrqz4.fsf@mail.linkov.net> (Juri Linkov's message of "Mon, 24 May 2021 02:35:19 +0300") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:269731 Archived-At: >> I also don't understand why :affixation-function is given a full list of >> completions, when it is presumably meant to return a list of exactly the >> same length. > > This has the advantage in functions like read-extended-command--affixation, > where minibuffer-selected-window is selected only once with with-selected-window, > then all completions are processed in the same buffer, without the need > to switch buffers for every completion in a long list, as annotation-function > would require to do. Why does the function use `with-selected-window`? I can't see why it would need to mess with windows. As for switching buffer, the only reason I can see to switch buffer is for `where-is-internal`, which could be fixed by pre-computing the set of keymaps (see patch below) which also makes sure we use the right buffer whereas `minibuffer-selected-window` could theoretically return another active minibuffer than "ours". Stefan diff --git a/lisp/simple.el b/lisp/simple.el index 2a90a076315..f0eff99a358 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2003,9 +2003,14 @@ read-extended-command "M-x ")) (lambda (string pred action) (if (and suggest-key-bindings (eq action 'metadata)) - '(metadata - (affixation-function . read-extended-command--affixation) - (category . command)) + ;; FIXME: Actually, we know that `overriding-local-map' is nil at + ;; this point. + (let ((keymaps (current-active-maps overriding-local-map))) + `(metadata + (affixation-function + . ,(lambda (arg) + (read-extended-command--affixation keymaps arg))) + (category . command))) (let ((pred (if (memq action '(nil t)) ;; Exclude from completions obsolete commands @@ -2093,25 +2098,24 @@ command-completion-button-p (and (get-text-property (point) 'button) (eq (get-text-property (point) 'category) category)))) -(defun read-extended-command--affixation (command-names) - (with-selected-window (or (minibuffer-selected-window) (selected-window)) - (mapcar - (lambda (command-name) - (let* ((fun (and (stringp command-name) (intern-soft command-name))) - (binding (where-is-internal fun overriding-local-map t)) - (obsolete (get fun 'byte-obsolete-info)) - (alias (symbol-function fun)) - (suffix (cond ((symbolp alias) - (format " (%s)" alias)) - (obsolete - (format " (%s)" (car obsolete))) - ((and binding (not (stringp binding))) - (format " (%s)" (key-description binding))) - (t "")))) - (put-text-property 0 (length suffix) - 'face 'completions-annotations suffix) - (list command-name "" suffix))) - command-names))) +(defun read-extended-command--affixation (keymaps command-names) + (mapcar + (lambda (command-name) + (let* ((fun (and (stringp command-name) (intern-soft command-name))) + (binding (where-is-internal fun keymaps t)) + (obsolete (get fun 'byte-obsolete-info)) + (alias (symbol-function fun)) + (suffix (cond ((symbolp alias) + (format " (%s)" alias)) + (obsolete + (format " (%s)" (car obsolete))) + ((and binding (not (stringp binding))) + (format " (%s)" (key-description binding))) + (t "")))) + (put-text-property 0 (length suffix) + 'face 'completions-annotations suffix) + (list command-name "" suffix))) + command-names)) (defcustom suggest-key-bindings t "Non-nil means show the equivalent key-binding when M-x command has one.