comparison lisp/ido.el @ 103191:1ea11abb22f8

Add proper support for confirm-nonexistent-file-or-buffer values `confirm' and `confirm-after-completion'. (ido-read-internal, ido-buffer-internal, ido-file-internal): Setup and handle require-match arg according to c-n-f-o-b. (ido-show-confirm-message): New dynamic variable. (ido-exit-minibuffer): Request confirmation for non-existing file or buffer according to confirm-nonexistent-file-or-buffer. (ido-decorations): Add 11th element for "confirm" message. (ido-completions): Show confirmation message when requested.

103190:21a9a415c6d0

  "String used by ido to separate the alternatives in the minibuffer.
Obsolete.  Set 3rd element of `ido-decorations' instead."
  :type '(choice string (const nil))
  :group 'ido)

(defcustom ido-decorations '( "{" "}" " | " " | ..." "[" "]" " [No match]" " [Matched]" " [Not readable]" " [Too big]")
  "List of strings used by ido to display the alternatives in the minibuffer.
There are 10 elements in this list:
1st and 2nd elements are used as brackets around the prospect list,
3rd element is the separator between prospects (ignored if `ido-separator' is set),
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)

(defcustom ido-use-faces t
  "Non-nil means use ido faces to highlighting first match, only match and

;; Buffer from which ido was entered.
(defvar ido-entry-buffer)

;; Non-nil if matching file must be selected.
(defvar ido-require-match)

;; Stores a temporary version of the file list being created.
(defvar ido-temp-list)

;; Non-nil if default list element should be rotated into place.

Return the name of a buffer or file selected.
PROMPT is the prompt to give to the user.
DEFAULT if given is the default item to start with.
If REQUIRE-MATCH is non-nil, an existing file must be selected.
If INITIAL is non-nil, it specifies the initial input string."
  ;; Ido does not implement the `confirm' and
  ;; `confirm-after-completion' values of REQUIRE-MATCH.
  (if (memq require-match '(confirm confirm-after-completion))
      (setq require-match nil))
  (let
      ((ido-cur-item item)
       (ido-entry-buffer (current-buffer))
       (ido-process-ignore-lists t)
       (ido-process-ignore-lists-inhibit nil)

       (ido-try-merged-list t)
       (ido-pre-merge-state nil)
       (ido-case-fold ido-case-fold)
       (ido-enable-prefix ido-enable-prefix)
       (ido-enable-regexp ido-enable-regexp)
       )

    (ido-setup-completion-map)
    (setq ido-text-init initial)
    (setq ido-input-stack nil)

	    (setq ido-cur-item (car elt))
	    (setq ido-text-init (cdr elt)))))

       ;; Handling the require-match must be done in a better way.
       ((and require-match
	     (not (if ido-directory-too-big
		      (file-exists-p (concat ido-current-directory ido-final-text))
		    (ido-existing-item-p))))
	(error "Must specify valid item"))

	(call-interactively (or fallback 'switch-to-buffer)))
    (let* ((ido-context-switch-command switch-cmd)
	   (ido-current-directory nil)
	   (ido-directory-nonreadable nil)
	   (ido-directory-too-big nil)
	   (buf (ido-read-internal 'buffer (or prompt "Buffer: ") 'ido-buffer-history default nil initial)))

      ;; Choose the buffer name: either the text typed in, or the head
      ;; of the list of matches

      (cond

		 (insert-buffer-substring (get-buffer buf))
		 (point))))
	  (ido-visit-buffer buf method t)))

       ;; buffer doesn't exist
       ((eq ido-create-new-buffer 'never)
	(message "No buffer matching `%s'" buf))

       ((and (eq ido-create-new-buffer 'prompt)
	     (not (y-or-n-p (format "No buffer matching `%s', create one? " buf))))
	nil)

       ;; create a new buffer
       (t

	(let ((minibuffer-completing-file-name t))
	  (setq filename (ido-read-internal item
					    (or prompt "Find file: ")
					    'ido-file-history
					    (and (eq method 'alt-file) buffer-file-name)
					    nil initial))))

      ;; Choose the file name: either the text typed in, or the head
      ;; of the list of matches

      (cond

(defun ido-exit-minibuffer ()
  "Exit minibuffer, but make sure we have a match if one is needed."
  (interactive)
  (if (and (or (not ido-require-match)
               (ido-existing-item-p))
           (not ido-incomplete-regexp))
      (exit-minibuffer)))

(defun ido-select-text ()

	(let ((inf (ido-completions
		    contents
		    minibuffer-completion-table
		    minibuffer-completion-predicate
		    (not minibuffer-completion-confirm))))
	  (ido-trace "inf" inf)
	  (insert inf))
	))))

(defun ido-completions (name candidates predicate require-match)

	  (if ind (setq first (concat first ind)))
	  (setq comps (cons first (cdr comps)))))

    (cond ((null comps)
	   (cond
	    (ido-directory-nonreadable
	     (or (nth 8 ido-decorations) " [Not readable]"))
	    (ido-directory-too-big
	     (or (nth 9 ido-decorations) " [Too big]"))
	    (ido-report-no-match

103191:1ea11abb22f8

  "String used by ido to separate the alternatives in the minibuffer.
Obsolete.  Set 3rd element of `ido-decorations' instead."
  :type '(choice string (const nil))
  :group 'ido)

(defcustom ido-decorations '( "{" "}" " | " " | ..." "[" "]" " [No match]" " [Matched]" " [Not readable]" " [Too big]" " [Confirm]")
  "List of strings used by ido to display the alternatives in the minibuffer.
There are 10 elements in this list:
1st and 2nd elements are used as brackets around the prospect list,
3rd element is the separator between prospects (ignored if `ido-separator' is set),
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',
11th element is displayed to confirm creating new file or buffer."
  :type '(repeat string)
  :group 'ido)

(defcustom ido-use-faces t
  "Non-nil means use ido faces to highlighting first match, only match and

;; Buffer from which ido was entered.
(defvar ido-entry-buffer)

;; Non-nil if matching file must be selected.
(defvar ido-require-match)

;; Non-nil if we should add [confirm] to prompt
(defvar ido-show-confirm-message)

;; Stores a temporary version of the file list being created.
(defvar ido-temp-list)

;; Non-nil if default list element should be rotated into place.

Return the name of a buffer or file selected.
PROMPT is the prompt to give to the user.
DEFAULT if given is the default item to start with.
If REQUIRE-MATCH is non-nil, an existing file must be selected.
If INITIAL is non-nil, it specifies the initial input string."
  (let
      ((ido-cur-item item)
       (ido-entry-buffer (current-buffer))
       (ido-process-ignore-lists t)
       (ido-process-ignore-lists-inhibit nil)

       (ido-try-merged-list t)
       (ido-pre-merge-state nil)
       (ido-case-fold ido-case-fold)
       (ido-enable-prefix ido-enable-prefix)
       (ido-enable-regexp ido-enable-regexp)
       (ido-show-confirm-message nil)
       )

    (ido-setup-completion-map)
    (setq ido-text-init initial)
    (setq ido-input-stack nil)

	    (setq ido-cur-item (car elt))
	    (setq ido-text-init (cdr elt)))))

       ;; Handling the require-match must be done in a better way.
       ((and require-match
	     (not (memq require-match '(confirm confirm-after-completion)))
	     (not (if ido-directory-too-big
		      (file-exists-p (concat ido-current-directory ido-final-text))
		    (ido-existing-item-p))))
	(error "Must specify valid item"))

	(call-interactively (or fallback 'switch-to-buffer)))
    (let* ((ido-context-switch-command switch-cmd)
	   (ido-current-directory nil)
	   (ido-directory-nonreadable nil)
	   (ido-directory-too-big nil)
	   (require-match (confirm-nonexistent-file-or-buffer))
	   (buf (ido-read-internal 'buffer (or prompt "Buffer: ") 'ido-buffer-history default
				   require-match initial)))

      ;; Choose the buffer name: either the text typed in, or the head
      ;; of the list of matches

      (cond

		 (insert-buffer-substring (get-buffer buf))
		 (point))))
	  (ido-visit-buffer buf method t)))

       ;; buffer doesn't exist
       ((and (eq ido-create-new-buffer 'never)
	     (null require-match))
	(message "No buffer matching `%s'" buf))

       ((and (eq ido-create-new-buffer 'prompt)
	     (null require-match)
	     (not (y-or-n-p (format "No buffer matching `%s', create one? " buf))))
	nil)

       ;; create a new buffer
       (t

	(let ((minibuffer-completing-file-name t))
	  (setq filename (ido-read-internal item
					    (or prompt "Find file: ")
					    'ido-file-history
					    (and (eq method 'alt-file) buffer-file-name)
					    (confirm-nonexistent-file-or-buffer) initial))))

      ;; Choose the file name: either the text typed in, or the head
      ;; of the list of matches

      (cond

(defun ido-exit-minibuffer ()
  "Exit minibuffer, but make sure we have a match if one is needed."
  (interactive)
  (if (and (or (not ido-require-match)
	       (if (memq ido-require-match '(confirm confirm-after-completion))
		   (if (or (eq ido-cur-item 'dir)
			   (eq last-command this-command))
		       t
		     (setq ido-show-confirm-message t)
		     nil))
               (ido-existing-item-p))
           (not ido-incomplete-regexp))
      (exit-minibuffer)))

(defun ido-select-text ()

	(let ((inf (ido-completions
		    contents
		    minibuffer-completion-table
		    minibuffer-completion-predicate
		    (not minibuffer-completion-confirm))))
	  (setq ido-show-confirm-message nil)
	  (ido-trace "inf" inf)
	  (insert inf))
	))))

(defun ido-completions (name candidates predicate require-match)

	  (if ind (setq first (concat first ind)))
	  (setq comps (cons first (cdr comps)))))

    (cond ((null comps)
	   (cond
	    (ido-show-confirm-message
	     (or (nth 11 ido-decorations) " [Confirm]"))
	    (ido-directory-nonreadable
	     (or (nth 8 ido-decorations) " [Not readable]"))
	    (ido-directory-too-big
	     (or (nth 9 ido-decorations) " [Too big]"))
	    (ido-report-no-match