From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Damien Cassou Newsgroups: gmane.emacs.bugs Subject: bug#36974: 26.2.90; [PATCH] Add imenu support to xref Date: Thu, 08 Aug 2019 13:53:03 +0200 Message-ID: <87h86rlvq8.fsf@cassou.me> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="48721"; mail-complaints-to="usenet@blaine.gmane.org" To: 36974@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Aug 08 13:54:11 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hvgzi-000CXm-8t for geb-bug-gnu-emacs@m.gmane.org; Thu, 08 Aug 2019 13:54:10 +0200 Original-Received: from localhost ([::1]:48666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvgzg-0008IG-Fv for geb-bug-gnu-emacs@m.gmane.org; Thu, 08 Aug 2019 07:54:08 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:48866) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvgzb-0008Hx-9F for bug-gnu-emacs@gnu.org; Thu, 08 Aug 2019 07:54:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvgza-0006yH-3A for bug-gnu-emacs@gnu.org; Thu, 08 Aug 2019 07:54:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:59427) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hvgzZ-0006yB-VI for bug-gnu-emacs@gnu.org; Thu, 08 Aug 2019 07:54:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hvgzZ-0000Mz-SR for bug-gnu-emacs@gnu.org; Thu, 08 Aug 2019 07:54:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Damien Cassou Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 08 Aug 2019 11:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 36974 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.15652652021366 (code B ref -1); Thu, 08 Aug 2019 11:54:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 8 Aug 2019 11:53:22 +0000 Original-Received: from localhost ([127.0.0.1]:40015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hvgyw-0000Ly-7B for submit@debbugs.gnu.org; Thu, 08 Aug 2019 07:53:22 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:54176) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hvgyu-0000Lo-PZ for submit@debbugs.gnu.org; Thu, 08 Aug 2019 07:53:21 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:48760) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvgys-0007Yv-VQ for bug-gnu-emacs@gnu.org; Thu, 08 Aug 2019 07:53:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvgyq-0006YF-U6 for bug-gnu-emacs@gnu.org; Thu, 08 Aug 2019 07:53:18 -0400 Original-Received: from mail.choca.pics ([2001:bc8:20ab::1]:52772) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hvgyq-0006Uf-B1 for bug-gnu-emacs@gnu.org; Thu, 08 Aug 2019 07:53:16 -0400 Original-Received: from localhost (localhost.localdomain [IPv6:::1]) by mail.choca.pics (Postfix) with ESMTP id DAA80F1B807 for ; Thu, 8 Aug 2019 13:53:06 +0200 (CEST) Original-Received: from mail.choca.pics ([IPv6:::1]) by localhost (mail.choca.pics [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id 2u-WPTmeM3eW for ; Thu, 8 Aug 2019 13:53:05 +0200 (CEST) Original-Received: from localhost (localhost.localdomain [IPv6:::1]) by mail.choca.pics (Postfix) with ESMTP id DA8CBF1B808 for ; Thu, 8 Aug 2019 13:53:05 +0200 (CEST) X-Virus-Scanned: amavisd-new at choca.pics Original-Received: from mail.choca.pics ([IPv6:::1]) by localhost (mail.choca.pics [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id Vm1-I5NS4zME for ; Thu, 8 Aug 2019 13:53:05 +0200 (CEST) Original-Received: from luz4 (arennes-659-1-13-31.w86-215.abo.wanadoo.fr [86.215.172.31]) by mail.choca.pics (Postfix) with ESMTPSA id 9E934F1B807 for ; Thu, 8 Aug 2019 13:53:05 +0200 (CEST) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:164758 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable * lisp/progmodes/xref.el (xref--imenu-prev-index-position) (xref--imenu-extract-index-name): Add functions to get imenu support. (xref--xref-buffer-mode): Set imenu variables to the new functions. * etc/NEWS: Add corresponding entry. --=20 Damien Cassou F=C3=B6retagsplatsen AB Phone/Fax: +46 (0)8 774 63 00 Mobile: +33 (0)6 80 50 18 91 Address: Skeppsbron 26, 4tr, SE-111 30 Stockholm Web: www.foretagsplatsen.se --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Add-imenu-support-to-xref.patch >From e7def47af8c5d8dfedadc5079d1f791c709b2be8 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 8 Aug 2019 13:42:20 +0200 Subject: [PATCH] Add imenu support to xref * lisp/progmodes/xref.el (xref--imenu-prev-index-position) (xref--imenu-extract-index-name): Add functions to get imenu support. (xref--xref-buffer-mode): Set imenu variables to the new functions. * etc/NEWS: Add corresponding entry. --- etc/NEWS | 5 +++++ lisp/progmodes/xref.el | 23 +++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 818875f7a0..50b2a0f76d 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1810,6 +1810,11 @@ This results in the use of Gravatar's default size of 80 pixels. This is possible using the new user options 'gravatar-default-image' and 'gravatar-force-default'. +** xref + +--- +*** Imenu support has been added to 'xref--xref-buffer-mode'. + * New Modes and Packages in Emacs 27.1 diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index 57d803894c..c00622f747 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -728,7 +728,11 @@ xref--xref-buffer-mode "Mode for displaying cross-references." (setq buffer-read-only t) (setq next-error-function #'xref--next-error-function) - (setq next-error-last-buffer (current-buffer))) + (setq next-error-last-buffer (current-buffer)) + (setq imenu-prev-index-position-function + #'xref--imenu-prev-index-position) + (setq imenu-extract-index-name-function + #'xref--imenu-extract-index-name)) (defvar xref--transient-buffer-mode-map (let ((map (make-sparse-keymap))) @@ -740,6 +744,21 @@ xref--transient-buffer-mode xref--xref-buffer-mode "XREF Transient") +(defun xref--imenu-prev-index-position () + "Move point to previous line in `xref' buffer. +This function is used as a value for +`imenu-prev-index-position-function'." + (if (bobp) + nil + (xref--search-property 'xref-group t))) + +(defun xref--imenu-extract-index-name () + "Return imenu name for line at point. +This function is used as a value for +`imenu-extract-index-name-function'. Point should be at the +beginning of the line." + (buffer-substring-no-properties (line-beginning-position) (line-end-position))) + (defun xref--next-error-function (n reset?) (when reset? (goto-char (point-min))) @@ -789,7 +808,7 @@ xref--insert-xrefs for line-format = (and max-line-width (format "%%%dd: " max-line-width)) do - (xref--insert-propertized '(face xref-file-header) group "\n") + (xref--insert-propertized '(face xref-file-header 'xref-group t) group "\n") (cl-loop for (xref . more2) on xrefs do (with-slots (summary location) xref (let* ((line (xref-location-line location)) -- 2.21.0 --=-=-=--