Use completing-read in eglot-code-actions

See also joaotavora/eglot#386. * eglot.el (eglot-code-actions): Replace tmm with completing-read Copyright-paperwork-exempt: yes Co-authored-by: João Távora <[email protected]> GitHub-reference: close joaotavora/eglot#393
sailfishos-mirror · Jan 2, 2020 · 234bbd1 · 234bbd1
1 parent d8a8bf4
commit 234bbd1
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
@@ -2466,12 +2466,10 @@ potentially rename EGLOT's help buffer."
          (menu `("Eglot code actions:" ("dummy" ,@menu-items)))
          (action (if (listp last-nonmenu-event)
                      (x-popup-menu last-nonmenu-event menu)
-                   (let ((never-mind (gensym)) retval)
-                     (setcdr (cadr menu)
-                             (cons `("never mind..." . ,never-mind) (cdadr menu)))
-                     (if (eq (setq retval (tmm-prompt menu)) never-mind)
-                         (keyboard-quit)
-                       retval)))))
+                   (cdr (assoc (completing-read "[eglot] Pick an action: " 
+						menu-items nil t
+						nil nil (car menu-items))
+                               menu-items)))))
     (eglot--dcase action
         (((Command) command arguments)
          (eglot-execute-command server (intern command) arguments))