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

[Juanma Barranquero]

Index: emacs/lisp/ido.el
diff -c emacs/lisp/ido.el:1.60 emacs/lisp/ido.el:1.61
*** emacs/lisp/ido.el:1.60      Wed Jun  8 12:00:46 2005
--- emacs/lisp/ido.el   Fri Jun 10 11:05:52 2005
***************
*** 345,351 ****
  ;;;###autoload
  (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...)
--- 345,351 ----
  ;;;###autoload
  (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...)
***************
*** 414,420 ****
    "*List of file extensions specifying preferred order of file selections.
  Each element is either a string with `.' as the first char, an empty
  string matching files without extension, or t which is the default order
! of for files with an unlisted file extension."
    :type '(repeat (choice string
                         (const :tag "Default order" t)))
    :group 'ido)
--- 414,420 ----
    "*List of file extensions specifying preferred order of file selections.
  Each element is either a string with `.' as the first char, an empty
  string matching files without extension, or t which is the default order
! for files with an unlisted file extension."
    :type '(repeat (choice string
                         (const :tag "Default order" t)))
    :group 'ido)
***************
*** 453,461 ****
  `otherframe'  Show new file in another frame
  `maybe-frame' If a file is visible in another frame, prompt to ask if you
                you want to see the file in the same window of the current
!               frame or in the other frame.
  `always-frame'  If a file is visible in another frame, raise that
!               frame.  Otherwise, visit the file in the same window."
      :type '(choice (const samewindow)
                   (const otherwindow)
                   (const display)
--- 453,461 ----
  `otherframe'  Show new file in another frame
  `maybe-frame' If a file is visible in another frame, prompt to ask if you
                you want to see the file in the same window of the current
!               frame or in the other frame
  `always-frame'  If a file is visible in another frame, raise that
!               frame; otherwise, visit the file in the same window"
      :type '(choice (const samewindow)
                   (const otherwindow)
                   (const display)
***************
*** 466,472 ****
  
  (defcustom ido-default-buffer-method  'always-frame
      "*How to switch to new buffer when using `ido-switch-buffer'.
! See ido-default-file-method for details."
      :type '(choice (const samewindow)
                   (const otherwindow)
                   (const display)
--- 466,472 ----
  
  (defcustom ido-default-buffer-method  'always-frame
      "*How to switch to new buffer when using `ido-switch-buffer'.
! See `ido-default-file-method' for details."
      :type '(choice (const samewindow)
                   (const otherwindow)
                   (const display)
***************
*** 530,536 ****
  (defcustom ido-max-prospects 12
    "*Non-zero means that the prospect list will be limited to than number of 
items.
  For a long list of prospects, building the full list for the minibuffer can 
take a
! non-negletable amount of time; setting this variable reduces that time."
    :type 'integer
    :group 'ido)
  
--- 530,536 ----
  (defcustom ido-max-prospects 12
    "*Non-zero means that the prospect list will be limited to than number of 
items.
  For a long list of prospects, building the full list for the minibuffer can 
take a
! non-negligible amount of time; setting this variable reduces that time."
    :type 'integer
    :group 'ido)
  
***************
*** 615,621 ****
  (defcustom ido-slow-ftp-hosts nil
    "*List of slow ftp hosts where ido prompting should not be used.
  If an ftp host is on this list, ido automatically switches to the non-ido
! equivalent function, e.g. find-file rather than ido-find-file."
    :type '(repeat string)
    :group 'ido)
  
--- 615,621 ----
  (defcustom ido-slow-ftp-hosts nil
    "*List of slow ftp hosts where ido prompting should not be used.
  If an ftp host is on this list, ido automatically switches to the non-ido
! equivalent function, e.g. `find-file' rather than `ido-find-file'."
    :type '(repeat string)
    :group 'ido)
  
***************
*** 706,712 ****
    :group 'ido)
  
  (defcustom ido-setup-hook  nil
!   "*Hook run after the ido variables and keymap has been setup.
  The dynamic variable `ido-cur-item' contains the current type of item that
  is read by ido, possible values are file, dir, buffer, and list.
  Additional keys can be defined in `ido-mode-map'."
--- 706,712 ----
    :group 'ido)
  
  (defcustom ido-setup-hook  nil
!   "*Hook run after the ido variables and keymap have been setup.
  The dynamic variable `ido-cur-item' contains the current type of item that
  is read by ido, possible values are file, dir, buffer, and list.
  Additional keys can be defined in `ido-mode-map'."
***************
*** 727,735 ****
  4th element is the string inserted at the end of a truncated list of 
prospects,
  5th and 6th elements are used as brackets around the common match string which
  can be completed using TAB,
! 7th element is the string displayed when there are a no matches, and
! 8th element is displayed if there is a single match (and faces are not used).
! 9th element is displayed when the current directory is non-readable.
  10th element is displayed when directory exceeds `ido-max-directory-size'."
    :type '(repeat string)
    :group 'ido)
--- 727,735 ----
  4th element is the string inserted at the end of a truncated list of 
prospects,
  5th and 6th elements are used as brackets around the common match string which
  can be completed using TAB,
! 7th element is the string displayed when there are no matches, and
! 8th element is displayed if there is a single match (and faces are not used),
! 9th element is displayed when the current directory is non-readable,
  10th element is displayed when directory exceeds `ido-max-directory-size'."
    :type '(repeat string)
    :group 'ido)
***************
*** 864,877 ****
  (defcustom ido-read-file-name-as-directory-commands '()
    "List of commands which uses read-file-name to read a directory name.
  When `ido-everywhere' is non-nil, the commands in this list will read
! the directory using ido-read-directory-name."
    :type '(repeat symbol)
    :group 'ido)
  
  (defcustom ido-read-file-name-non-ido '()
    "List of commands which shall not read file names the ido way.
  When `ido-everywhere' is non-nil, the commands in this list will read
! the file name using normal read-file-name style."
    :type '(repeat symbol)
    :group 'ido)
  
--- 864,877 ----
  (defcustom ido-read-file-name-as-directory-commands '()
    "List of commands which uses read-file-name to read a directory name.
  When `ido-everywhere' is non-nil, the commands in this list will read
! the directory using `ido-read-directory-name'."
    :type '(repeat symbol)
    :group 'ido)
  
  (defcustom ido-read-file-name-non-ido '()
    "List of commands which shall not read file names the ido way.
  When `ido-everywhere' is non-nil, the commands in this list will read
! the file name using normal `read-file-name' style."
    :type '(repeat symbol)
    :group 'ido)
  
***************
*** 895,901 ****
  (defvar ido-work-directory-list nil
    "List of actual working directory names.
  The current directory is inserted at the front of this list whenever a
! file is opened with ido-find-file and family.")
  
  (defvar ido-work-file-list nil
    "List of actual work file names.
--- 895,901 ----
  (defvar ido-work-directory-list nil
    "List of actual working directory names.
  The current directory is inserted at the front of this list whenever a
! file is opened with `ido-find-file' and family.")
  
  (defvar ido-work-file-list nil
    "List of actual work file names.
***************
*** 909,915 ****
  
  (defvar ido-ignore-item-temp-list nil
    "List of items to ignore in current ido invocation.
! Intended to be let-bound by functions which calls ido repeatedly.
  Should never be set permanently.")
  
  ;; Temporary storage
--- 909,915 ----
  
  (defvar ido-ignore-item-temp-list nil
    "List of items to ignore in current ido invocation.
! Intended to be let-bound by functions which call ido repeatedly.
  Should never be set permanently.")
  
  ;; Temporary storage
***************
*** 949,955 ****
  selected.")
  
  (defvar ido-current-directory nil
!   "Current directory for ido-find-file.")
  
  (defvar ido-auto-merge-timer nil
    "Delay timer for auto merge.")
--- 949,955 ----
  selected.")
  
  (defvar ido-current-directory nil
!   "Current directory for `ido-find-file'.")
  
  (defvar ido-auto-merge-timer nil
    "Delay timer for auto merge.")
***************
*** 2271,2277 ****
  
  (defun ido-magic-forward-char ()
    "Move forward in user input or perform magic action.
! If no user input is present or at end of input, perform magic actions:
  C-x C-b ... C-f  switch to ido-find-file.
  C-x C-f ... C-f  fallback to non-ido find-file.
  C-x C-d ... C-f  fallback to non-ido brief dired.
--- 2271,2277 ----
  
  (defun ido-magic-forward-char ()
    "Move forward in user input or perform magic action.
! If no user input is present, or at end of input, perform magic actions:
  C-x C-b ... C-f  switch to ido-find-file.
  C-x C-f ... C-f  fallback to non-ido find-file.
  C-x C-d ... C-f  fallback to non-ido brief dired.
***************
*** 2414,2426 ****
    (exit-minibuffer))
  
  (defun ido-enter-find-file ()
!   "Drop into find-file from buffer switching."
    (interactive)
    (setq ido-exit 'find-file)
    (exit-minibuffer))
  
  (defun ido-enter-switch-buffer ()
!   "Drop into ido-switch-buffer from file switching."
    (interactive)
    (setq ido-exit 'switch-to-buffer)
    (exit-minibuffer))
--- 2414,2426 ----
    (exit-minibuffer))
  
  (defun ido-enter-find-file ()
!   "Drop into `find-file' from buffer switching."
    (interactive)
    (setq ido-exit 'find-file)
    (exit-minibuffer))
  
  (defun ido-enter-switch-buffer ()
!   "Drop into `ido-switch-buffer' from file switching."
    (interactive)
    (setq ido-exit 'switch-to-buffer)
    (exit-minibuffer))
***************
*** 3016,3022 ****
  (defun ido-make-buffer-list (default)
    ;; Return the current list of buffers.
    ;; Currently visible buffers are put at the end of the list.
!   ;; The hook `ido-make-buflist-hook' is run after the list has been
    ;; created to allow the user to further modify the order of the buffer names
    ;; in this list.  If DEFAULT is non-nil, and corresponds to an existing 
buffer,
    ;; it is put to the start of the list.
--- 3016,3022 ----
  (defun ido-make-buffer-list (default)
    ;; Return the current list of buffers.
    ;; Currently visible buffers are put at the end of the list.
!   ;; The hook `ido-make-buffer-list-hook' is run after the list has been
    ;; created to allow the user to further modify the order of the buffer names
    ;; in this list.  If DEFAULT is non-nil, and corresponds to an existing 
buffer,
    ;; it is put to the start of the list.
***************
*** 3496,3502 ****
  ;;; VISIT CHOSEN BUFFER
  (defun ido-visit-buffer (buffer method &optional record)
    "Visit file named FILE according to METHOD.
! Record command in command-history if optional RECORD is non-nil."
  
    (let (win newframe)
      (cond
--- 3496,3502 ----
  ;;; VISIT CHOSEN BUFFER
  (defun ido-visit-buffer (buffer method &optional record)
    "Visit file named FILE according to METHOD.
! Record command in `command-history' if optional RECORD is non-nil."
  
    (let (win newframe)
      (cond
***************
*** 3569,3577 ****
  
  As you type in a string, all of the buffers matching the string are
  displayed if substring-matching is used \(default). Look at
! `ido-enable-prefix' and `ido-toggle-prefix'. When you have found the
! buffer you want, it can then be selected. As you type, most keys have their
! normal keybindings, except for the following: \\<ido-mode-map>
  
  RET Select the buffer at the front of the list of matches.  If the
  list is empty, possibly prompt to create new buffer.
--- 3569,3577 ----
  
  As you type in a string, all of the buffers matching the string are
  displayed if substring-matching is used \(default). Look at
! `ido-enable-prefix' and `ido-toggle-prefix'.  When you have found the
! buffer you want, it can then be selected.  As you type, most keys have
! their normal keybindings, except for the following: \\<ido-mode-map>
  
  RET Select the buffer at the front of the list of matches.  If the
  list is empty, possibly prompt to create new buffer.
***************
*** 3654,3664 ****
  default is to show it in the same window, unless it is already
  visible in another frame.
  
! The file name is selected interactively by typing a substring. As you type
! in a string, all of the filenames matching the string are displayed if
! substring-matching is used \(default). Look at `ido-enable-prefix' and
! `ido-toggle-prefix'. When you have found the filename you want, it can
! then be selected. As you type, most keys have their normal keybindings,
  except for the following: \\<ido-mode-map>
  
  RET Select the file at the front of the list of matches.  If the
--- 3654,3664 ----
  default is to show it in the same window, unless it is already
  visible in another frame.
  
! The file name is selected interactively by typing a substring.  As you
! type in a string, all of the filenames matching the string are displayed
! if substring-matching is used \(default).  Look at `ido-enable-prefix' and
! `ido-toggle-prefix'.  When you have found the filename you want, it can
! then be selected.  As you type, most keys have their normal keybindings,
  except for the following: \\<ido-mode-map>
  
  RET Select the file at the front of the list of matches.  If the
***************
*** 4171,4177 ****
  Return the name of a buffer selected.
  PROMPT is the prompt to give to the user.  DEFAULT if given is the default
  buffer to be selected, which will go to the front of the list.
! If REQUIRE-MATCH is non-nil, an existing-buffer must be selected."
    (let* ((ido-current-directory nil)
         (ido-directory-nonreadable nil)
         (ido-directory-too-big nil)
--- 4171,4177 ----
  Return the name of a buffer selected.
  PROMPT is the prompt to give to the user.  DEFAULT if given is the default
  buffer to be selected, which will go to the front of the list.
! If REQUIRE-MATCH is non-nil, an existing buffer must be selected."
    (let* ((ido-current-directory nil)
         (ido-directory-nonreadable nil)
         (ido-directory-too-big nil)