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

[Richard M. Stallman]

Index: emacs/lisp/ido.el
diff -c emacs/lisp/ido.el:1.25 emacs/lisp/ido.el:1.26
*** emacs/lisp/ido.el:1.25      Fri Jan 24 07:07:09 2003
--- emacs/lisp/ido.el   Sat Jan 25 14:42:15 2003
***************
*** 344,354 ****
  (defcustom ido-mode nil
    "Determines for which functional group \(buffer and files) ido behavior
  should be enabled. The following values are possible:
! - 'buffer: Turn only on ido buffer behavior \(switching, killing,
    displaying...) 
! - 'file: Turn only on ido file behavior \(finding, writing, inserting...)
! - 'both: Turn on ido buffer and file behavior.
! - nil: Turn off any ido switching.
  
  Setting this variable directly does not take effect;
  use either \\[customize] or the function `ido-mode'."
--- 344,354 ----
  (defcustom ido-mode nil
    "Determines for which functional group \(buffer and files) ido behavior
  should be enabled. The following values are possible:
! - `buffer': Turn only on ido buffer behavior \(switching, killing,
    displaying...) 
! - `file': Turn only on ido file behavior \(finding, writing, inserting...)
! - `both': Turn on ido buffer and file behavior.
! - `nil': Turn off any ido switching.
  
  Setting this variable directly does not take effect;
  use either \\[customize] or the function `ido-mode'."
***************
*** 560,571 ****
    :group 'ido)
  
  (defcustom ido-record-ftp-work-directories t
!   "*Non-nil means that remote directories are recorded in work directory 
list."
    :type 'boolean
    :group 'ido)
  
  (defcustom ido-merge-ftp-work-directories nil
!   "*Nil means that remote directories in work directory list are ignored 
during merge."
    :type 'boolean
    :group 'ido)
  
--- 560,571 ----
    :group 'ido)
  
  (defcustom ido-record-ftp-work-directories t
!   "*Non-nil means record ftp file names in the work directory list."
    :type 'boolean
    :group 'ido)
  
  (defcustom ido-merge-ftp-work-directories nil
!   "*If nil means merging ignores ftp file names in the work directory list."
    :type 'boolean
    :group 'ido)
  
***************
*** 739,753 ****
    "*List of functions to run when the find-file prompt is created.
  Each function on the list may modify the following dynamically bound
  variables:
!   dirname   - the (abbreviated) directory name to be modified by the hook 
functions
!   max-width - the max width of the resulting dirname; set to nil to inhibit 
truncation
!   prompt - the basic prompt (e.g. \"Find File: \")
!   literal - the string shown if doing `literal' find; set to nil to omit
!   vc-off  - the string shown if version control is inhibited; set to nit to 
omit
!   prefix  - normally nil, but may be set to a fixed prefix for the dirname
  The following variables are available, but should not be changed:
    ido-current-directory - the unabbreviated directory name
!   item - equals 'file or 'dir depending on the current mode."
    :type 'hook
    :group 'ido)
  
--- 739,755 ----
    "*List of functions to run when the find-file prompt is created.
  Each function on the list may modify the following dynamically bound
  variables:
!   dirname   - the (abbreviated) directory name
!                to be modified by the hook functions
!   max-width - the max width of the resulting dirname; nil means no limit
!   prompt    - the basic prompt (e.g. \"Find File: \")
!   literal   - the string shown if doing \"literal\" find; set to nil to omit
!   vc-off    - the string shown if version control is inhibited; set to nit to 
omit
!   prefix    - either nil or a fixed prefix for the dirname
! 
  The following variables are available, but should not be changed:
    ido-current-directory - the unabbreviated directory name
!   item - equals `file' or `dir' depending on the current mode."
    :type 'hook
    :group 'ido)
  
***************
*** 841,852 ****
  
  (defvar ido-work-file-list nil
    "List of actual work file names.
! The current file name (sans directory) is inserted at the front of this list
! whenever a file is opened with ido-find-file and family.")
  
  (defvar ido-dir-file-cache nil
!   "List of file-name-all-completions results.
! Each element in the list is of the form (dir (mtime) file...).")
  
  (defvar ido-ignore-item-temp-list nil
    "List of items to ignore in current ido invocation.
--- 843,855 ----
  
  (defvar ido-work-file-list nil
    "List of actual work file names.
! Opening a file with `ido-find-file' and similar functions
! inserts the current file name (relative to its containing directory)
! at the front of this list.")
  
  (defvar ido-dir-file-cache nil
!   "List of `file-name-all-completions' results.
! Each element in the list is of the form (DIR (MTIME) FILE...).")
  
  (defvar ido-ignore-item-temp-list nil
    "List of items to ignore in current ido invocation.
***************
*** 1958,1964 ****
           (string-match "[$]" ido-text))
        (let ((evar (substitute-in-file-name (concat ido-current-directory 
ido-text))))
        (if (not (file-exists-p (file-name-directory evar)))
!           (message "Expansion generates non-existing directory")
          (if (file-directory-p evar)
              (ido-set-current-directory evar)
            (let ((d (or (file-name-directory evar) "/"))
--- 1961,1967 ----
           (string-match "[$]" ido-text))
        (let ((evar (substitute-in-file-name (concat ido-current-directory 
ido-text))))
        (if (not (file-exists-p (file-name-directory evar)))
!           (message "Expansion generates non-existing directory name")
          (if (file-directory-p evar)
              (ido-set-current-directory evar)
            (let ((d (or (file-name-directory evar) "/"))