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] `completing-read`: Add `group-function` support to completion metadata (REVISED PATCH VERSION 2) Date: Sun, 09 May 2021 21:05:15 +0300 Organization: LINKOV.NET Message-ID: <87r1ifpyuc.fsf@mail.linkov.net> References: <0bbdeece-90d5-160c-07ec-2ad8edbf9872@daniel-mendler.de> <87czudm7bv.fsf@mail.linkov.net> <976056e8-3d46-db27-32c2-ddf3ca32d5a7@daniel-mendler.de> <878s5090e9.fsf@mail.linkov.net> <69fd42ed-a1a0-adcb-ac8b-caad80cb0967@daniel-mendler.de> <878s4zzpvc.fsf@mail.linkov.net> <95ac7ef3-5e8c-fc58-b316-544096c82aa0@daniel-mendler.de> <87o8dus00b.fsf@mail.linkov.net> <6718c89f-88a0-b529-1676-7e89fc152f00@daniel-mendler.de> <878s4w3law.fsf@mail.linkov.net> <87sg2ymq6j.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39693"; 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: Daniel Mendler , Gregory Heytings , "emacs-devel@gnu.org" , Dmitry Gutov To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun May 09 20:12:17 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 1lfnua-000AFe-IS for ged-emacs-devel@m.gmane-mx.org; Sun, 09 May 2021 20:12:16 +0200 Original-Received: from localhost ([::1]:55222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfnuZ-0006EW-JA for ged-emacs-devel@m.gmane-mx.org; Sun, 09 May 2021 14:12:15 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfns5-0002d8-QT for emacs-devel@gnu.org; Sun, 09 May 2021 14:09:41 -0400 Original-Received: from relay1-d.mail.gandi.net ([217.70.183.193]:21509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfns3-0002ZH-P0 for emacs-devel@gnu.org; Sun, 09 May 2021 14:09:41 -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 relay1-d.mail.gandi.net (Postfix) with ESMTPSA id D2E71240002; Sun, 9 May 2021 18:09:34 +0000 (UTC) In-Reply-To: (Stefan Monnier's message of "Sat, 08 May 2021 09:15:18 -0400") Received-SPF: pass client-ip=217.70.183.193; envelope-from=juri@linkov.net; helo=relay1-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, T_FILL_THIS_FORM_SHORT=0.01 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:269087 Archived-At: --=-=-= Content-Type: text/plain >> (defcustom read-char-by-name-group nil >> "How to group characters for `read-char-by-name' completion. >> When t, split characters to sections of Unicode blocks >> sorted alphabetically." >> ===================== >> >> It seems a new function is needed to sort groups, e.g. `group-sort-function`. > > I think whether the groups should be sorted alphabetically or "by order > of appearance" can be a choice made by the UI rather than by the > completion-table. Then this patch adds a new option read-char-by-name-group-sort, instead of read-char-by-name-group now replaced by completions-group: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=read-char-by-name-group-sort.patch diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index b99db46e45..5a7e417b8e 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -3088,35 +3088,14 @@ mule--ucs-names-affixation (list name (concat (if char (list char) " ") "\t") ""))) names)) -(defun mule--ucs-names-group (names) - (let* ((codes-and-names - (mapcar (lambda (name) (cons (gethash name ucs-names) name)) names)) - (grouped - (seq-group-by - (lambda (code-name) - (let ((script (aref char-script-table (car code-name)))) - (if script (symbol-name script) "ungrouped"))) - codes-and-names)) - names-with-header header) - (dolist (group (sort grouped (lambda (a b) (string< (car a) (car b))))) - (setq header t) - (dolist (code-name (cdr group)) - (push (list - (cdr code-name) - (concat - (if header - (progn - (setq header nil) - (concat "\n" (propertize - (format "* %s\n" (car group)) - 'face 'header-line))) - "") - ;; prefix - (if (car code-name) (format "%c" (car code-name)) " ") "\t") - ;; suffix - "") - names-with-header))) - (nreverse names-with-header))) +(defun mule--ucs-names-group (action arg) + (pcase action + ('title (let ((script (aref char-script-table (gethash arg ucs-names)))) + (if script (symbol-name script) "ungrouped"))) + ('transform arg) + ('sort (if read-char-by-name-group-sort + (sort arg (lambda (a b) (string< (car a) (car b)))) + arg)))) (defun char-from-name (string &optional ignore-case) "Return a character as a number from its Unicode name STRING. @@ -3148,11 +3127,12 @@ read-char-by-name-sort :group 'mule :version "28.1") -(defcustom read-char-by-name-group nil - "How to group characters for `read-char-by-name' completion. -When t, split characters to sections of Unicode blocks -sorted alphabetically." - :type 'boolean +(defcustom read-char-by-name-group-sort nil + "How to sort groups of characters for `read-char-by-name' completion. +When t, sort sections of Unicode blocks alphabetically." + :type '(choice + (const :tag "Unsorted group names" nil) + (const :tag "Group names sorted alphabetically" t)) :group 'mule :version "28.1") @@ -3169,8 +3149,9 @@ read-char-by-name the characters whose names include that substring, not necessarily at the beginning of the name. -The options `read-char-by-name-sort' and `read-char-by-name-group' -define the sorting order of completion characters and how to group them. +The options `read-char-by-name-sort', `completions-group', and +`read-char-by-name-group-sort' define the sorting order of completion +characters, how to group them, and how to sort groups. Accept a name like \"CIRCULATION FUNCTION\", a hexadecimal number like \"2A10\", or a number in hash notation (e.g., @@ -3189,10 +3170,11 @@ read-char-by-name (display-sort-function . ,(when (eq read-char-by-name-sort 'code) #'mule--ucs-names-sort-by-code)) + (group-function + . ,(when completions-group + #'mule--ucs-names-group)) (affixation-function - . ,(if read-char-by-name-group - #'mule--ucs-names-group - #'mule--ucs-names-affixation)) + . ,#'mule--ucs-names-affixation) (category . unicode-name)) (complete-with-action action (ucs-names) string pred))))) (char --=-=-=--