[Emacs-diffs] Changes to emacs/lisp/ido.el

[Kim F. Storm]

Index: emacs/lisp/ido.el
diff -c emacs/lisp/ido.el:1.26 emacs/lisp/ido.el:1.27
*** emacs/lisp/ido.el:1.26      Sat Jan 25 14:42:15 2003
--- emacs/lisp/ido.el   Mon Feb  3 17:33:13 2003
***************
*** 1352,1357 ****
--- 1352,1363 ----
        (define-key map "\C-k" 'ido-kill-buffer-at-head)
        )
  
+     (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))
+ 
      (setq ido-mode-map map)
      (run-hooks 'ido-define-mode-map-hook)))
  
***************
*** 2166,2171 ****
--- 2172,2181 ----
        (ido-up-directory t)))
     ((and ido-pre-merge-state (string-equal (car ido-pre-merge-state) 
ido-text))
      (ido-undo-merge-work-directory (substring ido-text 0 -1) t t))
+    ((eq this-original-command 'viper-backward-char)
+     (funcall this-original-command (prefix-numeric-value count)))
+    ((eq this-original-command 'viper-del-backward-char-in-insert)
+     (funcall this-original-command))
     (t
      (delete-backward-char (prefix-numeric-value count)))))
  
***************
*** 2175,2181 ****
    (if (= (minibuffer-prompt-end) (point))
        (if (not count)
          (ido-up-directory t))
!     (backward-kill-word (prefix-numeric-value count))))
  
  (defun ido-get-work-directory (&optional incr must-match)
    (let ((n (length ido-work-directory-list))
--- 2185,2193 ----
    (if (= (minibuffer-prompt-end) (point))
        (if (not count)
          (ido-up-directory t))
!     (if (eq this-original-command 'viper-delete-backward-word)
!       (funcall this-original-command (prefix-numeric-value count))
!       (backward-kill-word (prefix-numeric-value count)))))
  
  (defun ido-get-work-directory (&optional incr must-match)
    (let ((n (length ido-work-directory-list))