Changeset 4166 for trunk/lisp/ido.el

Timestamp:

09/18/06 20:48:14 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/ido.el (modified) (11 diffs)

trunk/lisp/ido.el

@@ -2113 +2113 @@
-  "Edit absolute file name entered so far with ido; terminate by RET."
-  (interactive)
-car ido-matches
+ido-name (car ido-matches)
-  (setq ido-exit 'edit)
-  (exit-minibuffer))
@@ -2427 +2427 @@
-           (not (and ido-enable-tramp-completion
-                     (string-equal ido-current-directory "/")
-car ido-matches
+ido-name (car ido-matches)
-      ;; only one choice, so select it.
-      (if (not ido-confirm-unique-completion)
@@ -2433 +2433 @@
-        (setq ido-rescan (not ido-enable-prefix))
-        (delete-region (minibuffer-prompt-end) (point))
-car ido-matches
+ido-name (car ido-matches)
-
-     (t ;; else there could be some completions
@@ -2815 +2815 @@
-  (interactive)
-  (when ido-matches
-car ido-matches
+ido-name (car ido-matches)
-    (setq ido-exit 'refresh)
-    (exit-minibuffer)))
@@ -2829 +2829 @@
-  (interactive)
-  (if ido-matches
-car ido-matches
+ido-name (car ido-matches)
-  (setq ido-exit 'push)
-  (exit-minibuffer))
@@ -3619 +3619 @@
-                   (and (>= flen (setq slen (length nextstr)))
-                        (string-equal (substring name (- flen slen)) nextstr)))
-bound
+unction
-                  (t nil))
-                 (setq ignorep t
@@ -3629 +3629 @@
-             (if (cond
-                  ((stringp nextstr) (string-match nextstr name))
-bound
+unction
-                  (t nil))
-                 (setq ignorep t
@@ -3746 +3746 @@
-  (interactive)
-  (let ((enable-recursive-minibuffers t)
-car ido-matches
+ido-name (car ido-matches)
-    (when buf
-      (kill-buffer buf)
@@ -3761 +3761 @@
-  (interactive)
-  (let ((enable-recursive-minibuffers t)
-car ido-matches
+ido-name (car ido-matches)
-    (if file
-        (setq file (concat ido-current-directory file)))
@@ -4203 +4203 @@
-             "/")
-            (ido-matches
-car ido-matches
+ido-name (car ido-matches)
-            (t
-             (concat ido-current-directory (substring contents 0 -1)))))
@@ -4239 +4239 @@
-                   (or (eq ido-enter-matching-directory 'first)
-                       (null (cdr ido-matches)))
-car ido-matches
+ido-name (car ido-matches)
-                   (or try-single-dir-match
-                       (eq ido-enter-matching-directory t)))
-          (ido-trace "single match" (car ido-matches))
-          (ido-set-current-directory
-car ido-matches
+ido-name (car ido-matches)
-          (setq ido-exit 'refresh)
-          (exit-minibuffer))