From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: [PATCH] `affixation-function`: Allow only three-element lists Date: Sun, 25 Apr 2021 20:46:08 +0300 Organization: LINKOV.NET Message-ID: <87h7jujmbn.fsf@mail.linkov.net> References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2691"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (x86_64-pc-linux-gnu) Cc: Stefan Monnier , emacs-devel@gnu.org To: Daniel Mendler Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Apr 25 19:49:24 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 1laism-0000XZ-4w for ged-emacs-devel@m.gmane-mx.org; Sun, 25 Apr 2021 19:49:24 +0200 Original-Received: from localhost ([::1]:43164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1laisl-0006ge-5A for ged-emacs-devel@m.gmane-mx.org; Sun, 25 Apr 2021 13:49:23 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:43258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lairR-0005R0-1Y for emacs-devel@gnu.org; Sun, 25 Apr 2021 13:48:01 -0400 Original-Received: from relay4-d.mail.gandi.net ([217.70.183.196]:42169) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lairL-00080Q-Mg for emacs-devel@gnu.org; Sun, 25 Apr 2021 13:48:00 -0400 X-Originating-IP: 91.129.102.166 Original-Received: from mail.gandi.net (m91-129-102-166.cust.tele2.ee [91.129.102.166]) (Authenticated sender: juri@linkov.net) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 3DAD5E0002; Sun, 25 Apr 2021 17:47:50 +0000 (UTC) In-Reply-To: (Daniel Mendler's message of "Sun, 25 Apr 2021 02:39:53 +0200") Received-SPF: pass client-ip=217.70.183.196; envelope-from=juri@linkov.net; helo=relay4-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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:268401 Archived-At: > @@ -2110,7 +2110,9 @@ minibuffer-completion-help > (cond > (aff-fun > (setq completions > - (funcall aff-fun completions))) > + (funcall aff-fun completions)) > + (cl-assert (or (not completions) > + (= 3 (length (car completions)))))) It's surprising to see that you added such artificial restriction. I expected a change with something more like this: diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index e435d0124a..324a171e66 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -2129,7 +2129,7 @@ minibuffer-completion-help (setq completions (mapcar (lambda (s) (let ((ann (funcall ann-fun s))) - (if ann (list s ann) s))) + (if ann (list s "" ann) s))) completions)))) and then simplify the implementation of completion--insert-strings by removing all complexity that handled suffix-only completion strings. > diff --git a/lisp/simple.el b/lisp/simple.el > index 999755a642..26eb8cad7f 100644 > --- a/lisp/simple.el > +++ b/lisp/simple.el > @@ -2080,8 +2080,11 @@ read-extended-command--affixation > (obsolete > (format " (%s)" (car obsolete))) > ((and binding (not (stringp binding))) > - (format " (%s)" (key-description binding)))))) > - (if suffix (list command-name suffix) command-name))) > + (format " (%s)" (key-description binding))) > + (t "")))) > + (put-text-property 0 (length suffix) > + 'face 'completions-annotations suffix) > + (list command-name "" suffix))) > command-names))) Why such change only for one particular use of annotations? Shouldn't completion--insert-strings check if the suffix is an empty string, and then put the 'completions-annotations' face on it?