From: Juri Linkov <juri@linkov.net>
Date: Sun, 5 Sep 2021 08:36:30 +0000 (+0300)
Subject: * lisp/progmodes/xref.el: Fix defcustoms (bug#50067)
X-Git-Tag: emacs-28.0.90~1167
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0972cbe42fe538ded8729c07116e0f98f9830d43;p=emacs.git

* lisp/progmodes/xref.el: Fix defcustoms (bug#50067)

* lisp/progmodes/xref.el (xref-auto-jump-to-first-definition)
(xref-auto-jump-to-first-xref, xref-search-program): Fix defcustoms.
---

diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 86cbdf1fb98..2181ecf9f37 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -421,9 +421,10 @@ elements is negated: these commands will NOT prompt."
 `show' means to show the first result's location, but keep the
 focus on the Xref buffer's window.
 `move' means to only move point to the first result."
-  :type '(choice (const t :tag "Jump")
-                 (const show :tag "Show")
-                 (const move :tag "Move point only"))
+  :type '(choice (const :tag "Jump" t)
+                 (const :tag "Show" show)
+                 (const :tag "Move point only" move)
+                 (const :tag "No auto-jump" nil))
   :version "28.1"
   :package-version '(xref . "1.2.0"))
 
@@ -432,9 +433,10 @@ focus on the Xref buffer's window.
 `show' means to show the first result's location, but keep the
 focus on the Xref buffer's window.
 `move' means to only move point to the first result."
-  :type '(choice (const t :tag "Jump")
-                 (const show :tag "Show")
-                 (const move :tag "Move point only"))
+  :type '(choice (const :tag "Jump" t)
+                 (const :tag "Show" show)
+                 (const :tag "Move point only" move)
+                 (const :tag "No auto-jump" nil))
   :version "28.1"
   :package-version '(xref . "1.2.0"))
 
@@ -1628,7 +1630,7 @@ The template should have the following fields:
   "The program to use for regexp search inside files.
 
 This must reference a corresponding entry in `xref-search-program-alist'."
-  :type `(choice
+  :type '(choice
           (const :tag "Use Grep" grep)
           (const :tag "Use ripgrep" ripgrep)
           (symbol :tag "User defined"))