Merge with CEDET upstream (rev. 8499).

[gnu-emacs] / lisp / ido.el

diff --git a/lisp/ido.el b/lisp/ido.el
index 066d8276af5c9582174e769e2071d9547798f331..589f44175ebe6f82c25efee5025d4e73d6acfcdd 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -927,7 +927,8 @@ ido is running.  Copied from `icomplete-minibuffer-setup-hook'."
   :type 'hook
   :group 'ido)
 
-(defcustom ido-save-directory-list-file (convert-standard-filename "~/.ido.last")
+(defcustom ido-save-directory-list-file
+  (locate-user-emacs-file "ido.last" ".ido.last")
   "File in which the ido state is saved between invocations.
 Variables stored are: `ido-last-directory-list', `ido-work-directory-list',
 `ido-work-file-list', and `ido-dir-file-cache'.