From e612e43f253c26afd087c71ed995bea25d096848 Mon Sep 17 00:00:00 2001 From: Daniel Mendler Date: Wed, 1 Mar 2023 19:27:38 +0100 Subject: [PATCH] progmodes/js: Use 'completing-read' instead of 'ido-completing-read' * lisp/progmodes/js.el (js--read-symbol): Don't use Ido. (Bug#74615) (cherry picked from commit e7fdf6b68ce7aeba9f3b503a1c5b8bf1a61800c1) --- lisp/progmodes/js.el | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index ef9cd894bcc..d6474a660f0 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -58,11 +58,8 @@ (eval-when-compile (require 'cl-lib) - (require 'ido) (require 'rx)) -(defvar ido-cur-list) -(declare-function ido-mode "ido" (&optional arg)) (declare-function treesit-parser-create "treesit.c") (declare-function treesit-induce-sparse-tree "treesit.c") (declare-function treesit-search-subtree "treesit.c") @@ -3288,11 +3285,7 @@ one from `js--get-all-known-symbols', using prompt PROMPT and initial input INITIAL-INPUT. Return a cons of (SYMBOL-NAME . LOCATION), where SYMBOL-NAME is a string and LOCATION is a marker." - (unless ido-mode - (ido-mode 1) - (ido-mode -1)) - - (let ((choice (ido-completing-read + (let ((choice (completing-read prompt (cl-loop for key being the hash-keys of symbols-table collect key) -- 2.39.2