Mercurial > emacs

changeset 69809:7dd2c54d4afb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(ido-mode): Set after ido-unc-hosts and ido-ignore-unc-host-regexps. (ido-save-history): Save ido-unc-hosts-cache. (ido-load-history): Load ido-unc-hosts-cache. (ido-reread-directory): Refresh unc hosts cache in // dir.
author Kim F. Storm <storm@cua.dk>
date Wed, 05 Apr 2006 14:17:08 +0000
parents c2821caabd95
children d6ae666344e2
files lisp/ido.el
diffstat 1 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ido.el	Wed Apr 05 14:16:54 2006 +0000
+++ b/lisp/ido.el	Wed Apr 05 14:17:08 2006 +0000
@@ -360,7 +360,10 @@
   :initialize 'custom-initialize-set
   :require 'ido
   :link '(emacs-commentary-link "ido.el")
-  :set-after '(ido-save-directory-list-file)
+  :set-after '(ido-save-directory-list-file
+	       ;; These clear ido-unc-hosts-cache, so set them
+	       ;; before loading history file.
+	       ido-unc-hosts ido-ignore-unc-host-regexps)
   :type '(choice (const :tag "Turn on only buffer" buffer)
                  (const :tag "Turn on only file" file)
                  (const :tag "Turn on both buffer and file" both)
@@ -1280,6 +1283,9 @@
 	    (ido-pp 'ido-work-directory-list)
 	    (ido-pp 'ido-work-file-list)
 	    (ido-pp 'ido-dir-file-cache "\n\n ")
+	    (if (listp ido-unc-hosts-cache)
+		(ido-pp 'ido-unc-hosts-cache)
+	      (insert "\n;; ----- ido-unc-hosts-cache -----\nt\n"))
 	    (insert "\n")
 	    (write-file ido-save-directory-list-file nil))
 	(kill-buffer buf)))))
@@ -1301,7 +1307,8 @@
 		    (setq ido-last-directory-list (read (current-buffer))
 			  ido-work-directory-list (read (current-buffer))
 			  ido-work-file-list (read (current-buffer))
-			  ido-dir-file-cache (read (current-buffer)))
+			  ido-dir-file-cache (read (current-buffer))
+			  ido-unc-hosts-cache (read (current-buffer)))
 		  (error nil)))
 	    (kill-buffer buf)))))
   (ido-wash-history))
@@ -2582,7 +2589,9 @@
   (interactive)
   (if (and ido-mode (eq ido-cur-item 'file))
       (progn
-	(ido-remove-cached-dir ido-current-directory)
+	(if (ido-is-unc-root)
+	    (setq ido-unc-hosts-cache t)
+	  (ido-remove-cached-dir ido-current-directory))
 	(setq ido-text-init ido-text)
 	(setq ido-rotate-temp t)
 	(setq ido-exit 'refresh)