From: Dmitry Gutov <dgutov@yandex.ru>
Date: Sat, 5 Dec 2020 00:57:46 +0000 (+0200)
Subject: Always show the summary
X-Git-Tag: emacs-28.0.90~4915
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c86dc8d4888bc0c5d56016c14c134123ec623072;p=emacs.git

Always show the summary

* lisp/progmodes/xref.el (xref--show-defs-minibuffer):
Always show the summary (at least for now).
---

diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index a78fed282cf..9f5fc57142b 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -947,24 +947,21 @@ local keymap that binds `RET' to `xref-quit-and-goto-xref'."
 
     (cl-loop for ((group . xrefs) . more1) on xref-alist
              do
-             (let ((show-summary (> (length xrefs) 1)))
-               (cl-loop for (xref . more2) on xrefs do
-                        (with-slots (summary location) xref
-                          (let* ((line (xref-location-line location))
-                                 (line-fmt
-                                  (if line
-                                      (format #("%d:" 0 2 (face xref-line-number))
-                                              line)
-                                    ""))
-                                 (group-fmt
-                                  (propertize
-                                   (substring group group-prefix-length)
-                                   'face 'xref-file-header))
-                                 (candidate
-                                  (if show-summary
-                                      (format "%s:%s%s" group-fmt line-fmt summary)
-                                    (format "%s" group-fmt))))
-                            (push (cons candidate xref) xref-alist-with-line-info))))))
+             (cl-loop for (xref . more2) on xrefs do
+                      (with-slots (summary location) xref
+                        (let* ((line (xref-location-line location))
+                               (line-fmt
+                                (if line
+                                    (format #("%d:" 0 2 (face xref-line-number))
+                                            line)
+                                  ""))
+                               (group-fmt
+                                (propertize
+                                 (substring group group-prefix-length)
+                                 'face 'xref-file-header))
+                               (candidate
+                                (format "%s:%s%s" group-fmt line-fmt summary)))
+                          (push (cons candidate xref) xref-alist-with-line-info)))))
 
     (setq xref (if (not (cdr xrefs))
                    (car xrefs)