aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-10-09 09:22:38 +0200
committerLars Ingebrigtsen2019-10-09 09:22:38 +0200
commit1204e7cb81093a42b781eb8c083af9d406de23e9 (patch)
treeda68651cec678c02367bcf9c003a5cd5091fb5c8
parent2497a31646db4d255135c16f7b5b318421c5d845 (diff)
downloademacs-1204e7cb81093a42b781eb8c083af9d406de23e9.tar.gz
emacs-1204e7cb81093a42b781eb8c083af9d406de23e9.zip
Fix possible initialisation error in shell-mode-map
* lisp/shell.el (shell-mode-map): Comint is the parent mode, so there's no need to explicitly make it a parent map here (bug#25187).
-rw-r--r--lisp/shell.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/shell.el b/lisp/shell.el
index fb2c36fa733..556330c8d5e 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -331,7 +331,7 @@ Thus, this does not include the shell's current directory.")
331 "Command used by `shell-resync-dirs' to query the shell.") 331 "Command used by `shell-resync-dirs' to query the shell.")
332 332
333(defvar shell-mode-map 333(defvar shell-mode-map
334 (let ((map (nconc (make-sparse-keymap) comint-mode-map))) 334 (let ((map (make-sparse-keymap)))
335 (define-key map "\C-c\C-f" 'shell-forward-command) 335 (define-key map "\C-c\C-f" 'shell-forward-command)
336 (define-key map "\C-c\C-b" 'shell-backward-command) 336 (define-key map "\C-c\C-b" 'shell-backward-command)
337 (define-key map "\t" 'completion-at-point) 337 (define-key map "\t" 'completion-at-point)