master 3fbe137adb 1/3: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 3fbe137adbc7cf3556977946fd3752a83a206118
Merge: e2b9f3347e 7f36aca99d
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    7f36aca99d * lisp/indent.el (tab-first-completion): Fix incorrect cho...
---
 lisp/indent.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lisp/indent.el b/lisp/indent.el
index 4e16d30ac9..d20c8053c5 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -77,10 +77,11 @@ This variable has no effect unless `tab-always-indent' is 
`complete'."
   :group 'indent
   :type '(choice
           (const :tag "Always complete" nil)
-          (const :tag "Unless at the end of a line" 'eol)
-          (const :tag "Unless looking at a word" 'word)
-          (const :tag "Unless at a word or parenthesis" 'word-or-paren)
-          (const :tag "Unless at a word, parenthesis, or punctuation." 
'word-or-paren-or-punct))
+          (const :tag "Unless at the end of a line" eol)
+          (const :tag "Unless looking at a word" word)
+          (const :tag "Unless at a word or parenthesis" word-or-paren)
+          (const :tag "Unless at a word, parenthesis, or punctuation."
+                 word-or-paren-or-punct))
   :version "28.1")
 
 (defvar indent-line-ignored-functions '(indent-relative