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

[Miles Bader]

Index: emacs/lisp/ido.el
diff -c emacs/lisp/ido.el:1.31.6.1 emacs/lisp/ido.el:1.31.6.2
*** emacs/lisp/ido.el:1.31.6.1  Fri Apr 16 12:50:05 2004
--- emacs/lisp/ido.el   Mon Jun 28 07:28:41 2004
***************
*** 1,6 ****
  ;;; ido.el --- interactively do things with buffers and files.
  
! ;; Copyright (C) 1996-2003  Free Software Foundation, Inc.
  
  ;; Author: Kim F. Storm <address@hidden>
  ;; Based on: iswitchb by Stephen Eglen <address@hidden>
--- 1,6 ----
  ;;; ido.el --- interactively do things with buffers and files.
  
! ;; Copyright (C) 1996-2004  Free Software Foundation, Inc.
  
  ;; Author: Kim F. Storm <address@hidden>
  ;; Based on: iswitchb by Stephen Eglen <address@hidden>
***************
*** 30,37 ****
  ;; for ido-switch-buffer and found the inspiration for ido-find-file.
  ;; The ido package would never have existed without his work.
  
! ;; Also thanks to Klaus Berndl, Rohit Namjoshi, Robert Fenk, Alex Schroeder,
! ;; Bill Benedetto, and Stephen Eglen for bug fixes and improvements.
  
  ;;; History
  
--- 30,38 ----
  ;; for ido-switch-buffer and found the inspiration for ido-find-file.
  ;; The ido package would never have existed without his work.
  
! ;; Also thanks to Klaus Berndl, Rohit Namjoshi, Robert Fenk, Alex
! ;; Schroeder, Bill Benedetto, Stephen Eglen, and many others for bug
! ;; fixes and improvements.
  
  ;;; History
  
***************
*** 55,61 ****
  ;; so I invented a common "ido-" namespace for the merged packages.
  ;;
  ;; This version is based on ido.el version 1.57 released on
! ;; gnu.emacs.sources adapted for emacs 21.4 to use command remapping
  ;; and optionally hooking the read-buffer and read-file-name functions.
  ;;
  ;; Prefix matching was added by Klaus Berndl <address@hidden> based on
--- 56,62 ----
  ;; so I invented a common "ido-" namespace for the merged packages.
  ;;
  ;; This version is based on ido.el version 1.57 released on
! ;; gnu.emacs.sources adapted for emacs 21.5 to use command remapping
  ;; and optionally hooking the read-buffer and read-file-name functions.
  ;;
  ;; Prefix matching was added by Klaus Berndl <address@hidden> based on
***************
*** 1667,1674 ****
         ((memq ido-exit '(edit chdir))
        (cond
         ((memq ido-cur-item '(file dir))
!         (let* ((process-environment (cons "HOME=/" process-environment)) ;; 
cheat read-file-name
!                (read-file-name-function nil)
                 (edit (eq ido-exit 'edit))
                 (d ido-current-directory)
                 (f ido-text-init)
--- 1668,1674 ----
         ((memq ido-exit '(edit chdir))
        (cond
         ((memq ido-cur-item '(file dir))
!         (let* ((read-file-name-function nil)
                 (edit (eq ido-exit 'edit))
                 (d ido-current-directory)
                 (f ido-text-init)
***************
*** 1676,1682 ****
            (setq ido-text-init "")
            (while new
              (setq new (if edit
!                            (read-file-name (concat prompt "[EDIT] ") d 
(concat d f) nil f)
                           f)
                    d (or (file-name-directory new) "/")
                    f (file-name-nondirectory new)
--- 1676,1684 ----
            (setq ido-text-init "")
            (while new
              (setq new (if edit
!                            (read-file-name (concat prompt "[EDIT] ")
!                                            (expand-file-name d)
!                                            (concat d f) nil f)
                           f)
                    d (or (file-name-directory new) "/")
                    f (file-name-nondirectory new)
***************
*** 3807,3821 ****
  
  ;;; Helper functions for other programs
  
  ;;;###autoload
  (defun ido-read-file-name (prompt &optional dir default-filename mustmatch 
initial predicate)
    "Read file name, prompting with PROMPT and completing in directory DIR.
  See `read-file-name' for additional parameters."
    (cond
    ((or (eq predicate 'file-directory-p)
         (memq this-command ido-read-file-name-as-directory-commands))
     (ido-read-directory-name prompt dir default-filename mustmatch initial))
!   ((and (not (memq this-command ido-read-file-name-non-ido))
        (or (null predicate) (eq predicate 'file-exists-p)))
     (let* (filename
          ido-saved-vc-hb
--- 3809,3827 ----
  
  ;;; Helper functions for other programs
  
+ (put 'dired-do-rename 'ido 'ignore)
+ 
  ;;;###autoload
  (defun ido-read-file-name (prompt &optional dir default-filename mustmatch 
initial predicate)
    "Read file name, prompting with PROMPT and completing in directory DIR.
  See `read-file-name' for additional parameters."
    (cond
    ((or (eq predicate 'file-directory-p)
+        (eq (get this-command 'ido) 'dir)
         (memq this-command ido-read-file-name-as-directory-commands))
     (ido-read-directory-name prompt dir default-filename mustmatch initial))
!   ((and (not (eq (get this-command 'ido) 'ignore))
!       (not (memq this-command ido-read-file-name-non-ido))
        (or (null predicate) (eq predicate 'file-exists-p)))
     (let* (filename
          ido-saved-vc-hb