diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-09-20 07:50:34 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-09-20 07:50:34 -0700 |
| commit | 44c1ce3a370ed94199751d1429a65f40880b9234 (patch) | |
| tree | c797f1b9a2aa388b2bfdd9ebe7b2a7555088d5ae /lisp/progmodes/xref.el | |
| parent | 229c51afbf741b20504b821e6fd5da4145a776f5 (diff) | |
| parent | d28d54c76754759e5f0fc8254541fbb4ef6a21d8 (diff) | |
| download | emacs-44c1ce3a370ed94199751d1429a65f40880b9234.tar.gz | |
Merge from origin/emacs-26
d28d54c (origin/emacs-26) More accurate docs for 'text-char-description'
b3baf99 Document synchronous behavior of eshell/make (Bug#32513)
98544ea Fix bs-show with wide characters (Bug#17822)
85af51b Improve Custom menu labels for 2 options
72a2a36 Improve wording of last change in dired-x.texi
d4fa83b Fix GnuTLS test suite with GnuTLS versions 3.4.x
b5bee6b Fix build with gnutls versions 3.0 to 3.2 (Bug#32446)
67eb80e ; * etc/enriched.txt (hanging-indents): Remove extra indent.
c71cfb7 Fix the Bubbles game on TTY frames
3bbf21b Add choice to reshow certificate information (Bug#31877)
6f2c471 * src/alloc.c (Fbool_vector, Flist, Fvector): Doc tweak.
39eecb3 * src/alloc.c (vector): Fix grammatical error in doc string: ...
Diffstat (limited to 'lisp/progmodes/xref.el')
| -rw-r--r-- | lisp/progmodes/xref.el | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index c85fe676da2..c7ae40eb34e 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -323,21 +323,23 @@ backward." (defcustom xref-prompt-for-identifier '(not xref-find-definitions xref-find-definitions-other-window xref-find-definitions-other-frame) - "When t, always prompt for the identifier name. + "If non-nil, prompt for the identifier to find. + +When t, always prompt for the identifier name. When nil, prompt only when there's no value at point we can use, or when the command has been called with the prefix argument. -Otherwise, it's a list of xref commands which will prompt -anyway (the value at point, if any, will be used as the default). - +Otherwise, it's a list of xref commands which will always prompt, +with the identifier at point, if any, used as the default. If the list starts with `not', the meaning of the rest of the -elements is negated." - :type '(choice (const :tag "always" t) - (const :tag "auto" nil) - (set :menu-tag "command specific" :tag "commands" +elements is negated: these commands will NOT prompt." + :type '(choice (const :tag "Always prompt for identifier" t) + (const :tag "Prompt if no identifier at point" nil) + (set :menu-tag "Prompt according to command" + :tag "Prompt according to command" :value (not) - (const :tag "Except" not) + (const :tag "Except for commands listed below" not) (repeat :inline t (symbol :tag "command"))))) (defcustom xref-after-jump-hook '(recenter |