From: Kim F. Storm Date: Wed, 5 Feb 2003 22:04:02 +0000 (+0000) Subject: (ido-define-mode-map): X-Git-Tag: ttn-vms-21-2-B4~11336 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9f781d7e1bb425437db94268b16c43a095f0bdb8;p=emacs.git (ido-define-mode-map): Undo last change (duplicates part of 2003-02-04 change). Remap `viper' delete commands only in file or dir mode. --- diff --git a/lisp/ido.el b/lisp/ido.el index 68e4852bf56..82da8a4c6bb 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -1324,8 +1324,6 @@ This function also adds a hook to the minibuffer." (define-key map [(meta down)] 'ido-next-work-directory) (define-key map [backspace] 'ido-delete-backward-updir) (define-key map "\d" 'ido-delete-backward-updir) - (define-key map [remap viper-backward-char] 'ido-delete-backward-updir) - (define-key map [remap viper-del-backward-char-in-insert] 'ido-delete-backward-updir) (define-key map [(meta backspace)] 'ido-delete-backward-word-updir) (define-key map [(control backspace)] 'ido-up-directory) (define-key map [(meta ?b)] 'ido-next-work-file) @@ -1355,10 +1353,11 @@ This function also adds a hook to the minibuffer." ) (when (if (boundp 'viper-mode) viper-mode) - (define-key map [remap viper-backward-char] 'ido-delete-backward-updir) - (define-key map [remap viper-del-backward-char-in-insert] 'ido-delete-backward-updir) - (define-key map [remap viper-delete-backward-word] 'ido-delete-backward-word-updir) - (define-key map [remap viper-intercept-ESC-key] 'ignore)) + (define-key map [remap viper-intercept-ESC-key] 'ignore) + (when (memq ido-cur-item '(file dir)) + (define-key map [remap viper-backward-char] 'ido-delete-backward-updir) + (define-key map [remap viper-del-backward-char-in-insert] 'ido-delete-backward-updir) + (define-key map [remap viper-delete-backward-word] 'ido-delete-backward-word-updir))) (setq ido-mode-map map) (run-hooks 'ido-define-mode-map-hook)))