From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Gabriel Newsgroups: gmane.emacs.bugs Subject: bug#59581: 29.0.50; [PATCH] Add completions details to Bookmarks Date: Fri, 25 Nov 2022 16:19:38 -0300 Message-ID: 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="26806"; mail-complaints-to="usenet@ciao.gmane.io" To: 59581@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Nov 25 20:20:13 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1oyeFA-0006if-BI for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 25 Nov 2022 20:20:12 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyeF2-00024t-Bp; Fri, 25 Nov 2022 14:20:04 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oyeF0-00024f-VI for bug-gnu-emacs@gnu.org; Fri, 25 Nov 2022 14:20:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyeF0-0003n1-LY for bug-gnu-emacs@gnu.org; Fri, 25 Nov 2022 14:20:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyeF0-0006z6-II for bug-gnu-emacs@gnu.org; Fri, 25 Nov 2022 14:20:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Gabriel Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 25 Nov 2022 19:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59581 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.166940399226825 (code B ref -1); Fri, 25 Nov 2022 19:20:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 25 Nov 2022 19:19:52 +0000 Original-Received: from localhost ([127.0.0.1]:37174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyeEp-0006yb-IX for submit@debbugs.gnu.org; Fri, 25 Nov 2022 14:19:52 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:41482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyeEm-0006yR-Km for submit@debbugs.gnu.org; Fri, 25 Nov 2022 14:19:50 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oyeEm-00023S-FZ for bug-gnu-emacs@gnu.org; Fri, 25 Nov 2022 14:19:48 -0500 Original-Received: from mail-sn1nam02olkn2027.outbound.protection.outlook.com ([40.92.44.27] helo=NAM02-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oyeEk-0003k7-Gs for bug-gnu-emacs@gnu.org; Fri, 25 Nov 2022 14:19:48 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QAGAcHLtP65qHiZ3RNbMlz8JFJTBbqVQ8ZpGuk8zWFGaYQilP2o9JaVyVBwSUvzkICM0gZENKBV0nFt1//ZJiJuZgOHfnH3l05TTRUd+Q30OMCwUPGO9dA2scPdsi9ZK/0CMuTp0LasJxcZXDpKqzGxBIiP9pitnAaiNr7+GeZhMdc6xQyySN6edTD48QNyVEs4dfjPreWCm9mszuJYVXJSkHxEZM0p3XeM8fbu+p4tNV36j9/7AKBV+Reg/nBy0Mpq3RdkAL6IFjuuZmduT08vyFlHltd0Kjy8gp5ii5S+NzegJqW7dfV0JEPckSJFJcySsU3SR4PE8s5ctWsf4Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4Ielg9uy8tul0EP9NqMbW2KzfuseMMbWV6t+Vo/2avM=; b=jpN9sjimp/05YgnwTJDDNoiCclmeDAiR01A6xhH+y+1NMl7dKw3k9IFJcbThAdWdXTOLQZKHQao100x5bBDDxQtqGu7IDUXmr8DylqLboaG8K1PVUyAkN7WiAcsVW88ynEH5bycoct0fxbM4UqjLpTMoSeVl2nR9eY2dLDHo4yQfQ7KmYhTZ/6Wd1EINAfxbLdqL7/u8l8Y9wTQtHK4rOoeJXj6trMbDhGXAEtpuKEFyCekE1qtOCMkbyjR3swZJV7ekD1oZPafmRVtpbmKrZdLN1kH4jLRkFNyQjhOV+IzMv/7dpacWenS9kOM2U70jy5znYWnEWjXx8CEht8jyQg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4Ielg9uy8tul0EP9NqMbW2KzfuseMMbWV6t+Vo/2avM=; b=PFUlCZyUhj6FoMRrY71UqQoL0BQtfE1WH+5syRdBwF9/SM6ma9fMqrDR3M2cel0wU5zpffb8F5p+Ldk4h8Q2txKzlJu0vQi+nMnYNEh3pBOlSrH4p06+/4HcPoh+SS6S2xgpkySplbtePpkaAwVL4gk6fneIHpTVO+0qLsFlNF7YEJUrUjU75BowuYVfnBe97+XIjlyQBO3u7DHA43zwKtRvyS1gu2DCyNm/s+Th++Jv8Npk9CnFi0CdgXz7tyGCKUwOTcUXVaYInWFblDbhlTjFmQNp1Wa1DYSsdaD6N3GuDlK0GL3csPxEOjnNS5bpG3FqnHoKRCuHKhbbavIj9Q== Original-Received: from SJ0PR06MB8609.namprd06.prod.outlook.com (2603:10b6:a03:40c::11) by BN8PR06MB5476.namprd06.prod.outlook.com (2603:10b6:408:40::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.17; Fri, 25 Nov 2022 19:19:44 +0000 Original-Received: from SJ0PR06MB8609.namprd06.prod.outlook.com ([fe80::33ae:d3a7:24ae:5c6f]) by SJ0PR06MB8609.namprd06.prod.outlook.com ([fe80::33ae:d3a7:24ae:5c6f%5]) with mapi id 15.20.5880.005; Fri, 25 Nov 2022 19:19:43 +0000 X-TMN: [2ITKBQG1GmUZEqzLStZByjPRAHR9asmvKLps/QizoFcQt59PR8FWj+Mic0cMWBYW] X-ClientProxiedBy: CP6P284CA0049.BRAP284.PROD.OUTLOOK.COM (2603:10d6:103:1ab::18) To SJ0PR06MB8609.namprd06.prod.outlook.com (2603:10b6:a03:40c::11) X-Microsoft-Original-Message-ID: <875yf2zvsl.fsf@hotmail.com> X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR06MB8609:EE_|BN8PR06MB5476:EE_ X-MS-Office365-Filtering-Correlation-Id: 86b991db-beee-43e1-2cbf-08dacf1a01df X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MK5NpNe9PZ3nOm5ABC5nhVVAyWLrzRD6T/NtXKtPm75gqsNMBM3oVOCRvdHqryOlc6yYlpVqy9czrwwxDoaRC3etQ9eFDbA+eY7Ga0luDjrQo17SVrFKxMckOodrtjwZCA4UGV51HTB650qVjKw/j4yTzjYYyXGVBPhGlrCy+KSIFpJEJAB6rm25xbEivNf8qRjEKI/L1CA1Z5OXdiYQAgnF8AalLU8MZyYHo4G5qSZEW1ey1+ZZZJefJ03WqJ1QUSTgZ91LN3/R5CifZsSbl2zzXFlbyN85bjv5nNXeZmC/DRi227VZptKgpSnpZBeHH+VrTw2/iUd9IPSgzRPUH2v+rB50XirCZ7E3vLpBwNfgmm6V/rEAqz9mcLDKplJB3I8L5lGlrqDPlPBfs5Crkn7oWcylAyuf2RIq/vxhaT02934ke+vstdv7dMdabqrVgXbOktB7fD3WuAPw5HdAuGq9Z71HzKbrhcwnwv8mUl0L8HLUVQ4Epzre9WagTNYLBA4IpEHDBdEhOeQ09KHQtio+yHUi8l5oJaT1Rtfi25Qmx5EAowna5Z+Mk2Zog8Jx9xpjmDicEeOzi1dE6gmLAPcndbaPCAonEGmFhvAx5VU= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vkM+uzXuRWLwhWHGxLwvm/lnxtGdP34LC3rq2hCJPgsjl4LElFvaXxxIWt+ZKLFhoAr11J3ShiW0dJoi+XZM+T7X3WZdKOXFO1GndilQEIMRbuREeHbU+C+oqiqF5/4KHMwnId5XcfDghD63Ly1jdEOO3jiWMIrhTxQfrYpH9uXS3bjSUl0lUrV3HmQdoBCT3GxjMhKkDmXQwMJnVlMCScG1QxrKLpL+uPkqeOhnaWEDkeJEJsj2/EzvzcXm/Zcl4EL8X0PBp738LTFpbz+SamEvgFZQB3drp2ILluXvcQRzhymh+YwMAcYMgfwcSy6XAOeJn7tIdJCwIDfxnk1SPLqDkEC4DKZ0eDEa8dKy3yr7wpQqX21TDJPtDGuTEkYHTWsmHCrL6YmJD1coNzf/BBMSAoZ5oPZh0BjoeeRXjggc6v2EkH0xXECAngQ983E7ZWHWFekqGej+0l8V9jnF772w/kfrNCP6SaffkYMGc517hPmbElO0N8OPO/i/3wDuCCv3j4JinuZemLtksY3RcXhAYq7p5fZVafBJPJqUFd0lFbH0OCkYRWiSjSdTlKu2mWjko8il3qoDIQbad8NK9I90upw8x8nCZliYo4Oo2SboG8wh2iqP6emPQhn7jh4cyoQ9bfI3Xmd8wFd9r8/yOWa2QnwVp4gHNlXzxc/60ddIxyIQYoMpLwFUgsK5mTH5Bo1tg6j7LrYVIF4OEQRZLfCi+XJvhBPgfxV6kjq7i9M8pX1hQ1asT0gKVI 58Rk4eoZGC54UovmczgF1THLUGaWzDPzE38S/ABWAjsBF6cJipUO+iMG3/iXUOSkFtt7grg17Wa455h/TKNRsnPivvWfWGMRsm X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-89723.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 86b991db-beee-43e1-2cbf-08dacf1a01df X-MS-Exchange-CrossTenant-AuthSource: SJ0PR06MB8609.namprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2022 19:19:43.7754 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR06MB5476 Received-SPF: pass client-ip=40.92.44.27; envelope-from=gabriel376@hotmail.com; helo=NAM02-SN1-obe.outbound.protection.outlook.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:249023 Archived-At: --=-=-= Content-Type: text/plain Severity: wishlist Description: Add completions details (see `completions-detailed') to Bookmarks. It affects all bookmark functions that make uses of `bookmark-completing-read' (e.g.: `bookmark-jump', `bookmark-relocate', `bookmark-insert-location', `bookmark-rename' etc). See also [1]. [1] https://lists.gnu.org/archive/html/emacs-devel/2022-11/msg00995.html --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Add-completions-details-to-Bookmarks.patch >From 188d924aaa8842c85a4d4206d6c71ca31727240e Mon Sep 17 00:00:00 2001 From: Gabriel do Nascimento Ribeiro Date: Fri, 25 Nov 2022 16:07:14 -0300 Subject: [PATCH 1/1] Add completions details to Bookmarks * lisp/bookmark.el (bookmark-completing-read--collection) (bookmark-completing-read--affixation-function): New auxiliary functions to add completion details to bookmark-completing-read. (bookmark-completing-read): Make use of new auxiliary function. --- lisp/bookmark.el | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 7f3a264f53..9050668f4f 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -541,6 +541,23 @@ bookmark-maybe-sort-alist (t (time-less-p ty tx))))))) (t copy)))) +(defun bookmark-completing-read--collection (string pred action) + (if (eq action 'metadata) + `(metadata (category . bookmark) + ,@(when completions-detailed + '((affixation-function . bookmark-completing-read--affixation-function)))) + (complete-with-action action bookmark-alist string pred))) + +(defun bookmark-completing-read--affixation-function (bookmarks) + (seq-map (lambda (record) + (list record + nil + (propertize (format " %-11s %s" + (or (bookmark-type-from-full-record record) "") + (bookmark-location record)) + 'face 'completions-annotations))) + bookmarks)) + (defun bookmark-completing-read (prompt &optional default) "Prompting with PROMPT, read a bookmark name in completion. PROMPT will get a \": \" stuck on the end no matter what, so you @@ -555,14 +572,9 @@ bookmark-completing-read (let* ((completion-ignore-case bookmark-completion-ignore-case) (default (unless (equal "" default) default))) (completing-read (format-prompt prompt default) - (lambda (string pred action) - (if (eq action 'metadata) - '(metadata (category . bookmark)) - (complete-with-action - action bookmark-alist string pred))) + #'bookmark-completing-read--collection nil 0 nil 'bookmark-history default)))) - (defmacro bookmark-maybe-historicize-string (string) "Put STRING into the bookmark prompt history, if caller non-interactive. We need this because sometimes bookmark functions are invoked -- 2.34.1 --=-=-= Content-Type: text/plain --- Gabriel --=-=-=--