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: Tue, 11 May 2021 21:06:53 +0300 Organization: LINKOV.NET Message-ID: <87eeed2l0q.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> <87r1ifpyuc.fsf@mail.linkov.net> <83eeef7nzh.fsf@gnu.org> 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="40233"; 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: mail@daniel-mendler.de, gregory@heytings.org, dgutov@yandex.ru, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue May 11 20:35:03 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 1lgXDj-000AKq-0X for ged-emacs-devel@m.gmane-mx.org; Tue, 11 May 2021 20:35:03 +0200 Original-Received: from localhost ([::1]:59788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgXDi-00069e-45 for ged-emacs-devel@m.gmane-mx.org; Tue, 11 May 2021 14:35:02 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgXAr-0002si-A9 for emacs-devel@gnu.org; Tue, 11 May 2021 14:32:05 -0400 Original-Received: from relay7-d.mail.gandi.net ([217.70.183.200]:43527) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgXAo-0007x8-IZ; Tue, 11 May 2021 14:32:05 -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 relay7-d.mail.gandi.net (Postfix) with ESMTPSA id E4DB220007; Tue, 11 May 2021 18:31:56 +0000 (UTC) In-Reply-To: <83eeef7nzh.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 09 May 2021 21:37:06 +0300") Received-SPF: pass client-ip=217.70.183.200; envelope-from=juri@linkov.net; helo=relay7-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.001, RCVD_IN_MSPIKE_WL=0.001, 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:269172 Archived-At: --=-=-= Content-Type: text/plain >> +(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." > > This doesn't say what happens if the value is not t. And since the > first sentence says "How to sort...", the idea that the result is > unsorted group names doesn't come to mind naturally. Now read-char-by-name-group-sort is removed, since this can be customized by completions-group-sort-function. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=read-char-by-name-group.patch diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 7f8d98b7ce..f7f8384e01 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -3104,35 +3104,11 @@ 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 (name transform) + (if transform + name + (let ((script (aref char-script-table (gethash name ucs-names)))) + (if script (symbol-name script) "ungrouped")))) (defun char-from-name (string &optional ignore-case) "Return a character as a number from its Unicode name STRING. @@ -3164,14 +3140,6 @@ 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 - :group 'mule - :version "28.1") - (defun read-char-by-name (prompt) "Read a character by its Unicode name or hex number string. Display PROMPT and read a string that represents a character by its @@ -3185,8 +3153,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 +`completions-group-sort-function' define the sorting order of +completion characters, whether 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., @@ -3205,10 +3174,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 --=-=-=--