Revert "Fix eshell-mode-map initialization"

It makes eshell-return-exits-minibuffer permanently affect the
eshell-mode-map (Bug#41370).

Do not merge to master, we will fix it properly there.

1 files changed, 1 insertions, 12 deletions

diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el
index bf5a4bf1afe..85593e45160 100644
--- a/lisp/eshell/em-rebind.el
+++ b/lisp/eshell/em-rebind.el
@@ -137,11 +137,6 @@ This is default behavior of shells like bash."
   :type '(repeat function)
   :group 'eshell-rebind)
 
-(defvar eshell-rebind-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-c M-l") #'eshell-lock-local-map)
-    map))
-
 ;; Internal Variables:
 
 (defvar eshell-input-keymap)
@@ -150,12 +145,6 @@ This is default behavior of shells like bash."
 
 ;;; Functions:
 
-(define-minor-mode eshell-rebind-mode
-  "Minor mode for the eshell-rebind module.
-
-\\{eshell-rebind-mode-map}"
-  :keymap eshell-rebind-mode-map)
-
 (defun eshell-rebind-initialize ()  ;Called from `eshell-mode' via intern-soft!
   "Initialize the inputting code."
   (unless eshell-non-interactive-p
@@ -165,7 +154,7 @@ This is default behavior of shells like bash."
     (make-local-variable 'overriding-local-map)
     (add-hook 'post-command-hook 'eshell-rebind-input-map nil t)
     (set (make-local-variable 'eshell-lock-keymap) nil)
-    (eshell-rebind-mode)))
+    (define-key eshell-command-map [(meta ?l)] 'eshell-lock-local-map)))
 
 (defun eshell-lock-local-map (&optional arg)
   "Lock or unlock the current local keymap.