* textmodes/artist.el (artist-system): Allow make-temp-file to use

[gnu-emacs] / lisp / ido.el

diff --git a/lisp/ido.el b/lisp/ido.el
index a25c13c301bffefcf523237776ed58e9e5ef243f..0ca8965b72e192bc0794f1263a2ca38ebf59dacd 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1,7 +1,7 @@
 ;;; ido.el --- interactively do things with buffers and files.
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Based on: iswitchb by Stephen Eglen <stephen@cns.ed.ac.uk>
@@ -1803,6 +1803,10 @@ 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))