* lisp/progmodes/elisp-mode.el (elisp-completion-at-point): Fix bug#68514

Redo the commit 0db2126d7176 to try and avoid selecting more than
a mere symbol.

1 files changed, 10 insertions, 5 deletions

diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 00910fb67c7..da0cb96e1cf 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -657,12 +657,13 @@ functions are annotated with \"<f>\" via the
                     (save-excursion
                       (backward-sexp 1)
                       (skip-chars-forward "`',‘#")
-                      (point))
+                      (min (point) pos))
                   (scan-error pos)))
            (end
-            (unless (or (eq beg (point-max))
-                        (member (char-syntax (char-after beg))
-                                '(?\" ?\()))
+            (cond
+             ((and (< beg (point-max))
+                   (memq (char-syntax (char-after beg))
+                                   '(?w ?\\ ?_)))
               (condition-case nil
                   (save-excursion
                     (goto-char beg)
@@ -670,7 +671,11 @@ functions are annotated with \"<f>\" via the
                     (skip-chars-backward "'’")
                     (when (>= (point) pos)
                       (point)))
-                (scan-error pos))))
+                (scan-error pos)))
+             ((or (>= beg (point-max))
+                  (memq (char-syntax (char-after beg))
+                        '(?\) ?\s)))
+              beg)))
            ;; t if in function position.
            (funpos (eq (char-before beg) ?\())
            (quoted (elisp--form-quoted-p beg))