emacs: lisp/ido.el comparison

comparison lisp/ido.el @ 90370:e3bacb89536a

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-46 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 157-163) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 58-61) - Update from CVS

author	Miles Bader <miles@gnu.org>
date	Sun, 19 Mar 2006 19:43:57 +0000
parents	8a1ee48a8386 4a6d7cd41a8f
children	482dfed28bee

comparison

equal deleted inserted replaced

-:88810aee3a45
+:e3bacb89536a
 :type 'boolean
 :group 'ido)
 (defcustom ido-cache-ftp-work-directory-time 1.0
 "*Maximum time to cache contents of an ftp directory (in hours).
+Use C-l in prompt to refresh list.
 If zero, ftp directories are not cached."
 :type 'number
 :group 'ido)
 (defcustom ido-slow-ftp-hosts nil
 :group 'ido)
 (defcustom ido-slow-ftp-host-regexps nil
 "*List of regexps matching slow ftp hosts (see `ido-slow-ftp-hosts')."
 :type '(repeat regexp)
+:group 'ido)
+(defcustom ido-unc-hosts nil
+"*List of known UNC host names to complete after initial //."
+:type '(repeat string)
+:group 'ido)
+(defcustom ido-cache-unc-host-shares-time 8.0
+"*Maximum time to cache shares of an UNC host (in hours).
+Use C-l in prompt to refresh list.
+If zero, unc host shares are not cached."
+:type 'number
 :group 'ido)
 (defcustom ido-max-work-file-list 10
 "*Maximum number of names of recently opened files to record.
 This is the list the file names (sans directory) which have most recently
 	  (setq truncate-lines t)))))
 (defun ido-is-tramp-root (&optional dir)
 (and ido-enable-tramp-completion
 (string-match "\\`/[^/]+[@:]\\'"
+		     (or dir ido-current-directory))))
+(defun ido-is-unc-root (&optional dir)
+(and ido-unc-hosts
+(string-equal "//"
+		     (or dir ido-current-directory))))
+(defun ido-is-unc-host (&optional dir)
+(and ido-unc-hosts
+(string-match "\\`//[^/]+/\\'"
 		     (or dir ido-current-directory))))
 (defun ido-is-root-directory (&optional dir)
 (setq dir (or dir ido-current-directory))
 (or
 (and (numberp ido-cache-ftp-work-directory-time)
 (> ido-cache-ftp-work-directory-time 0)
 (or (not time)
 	   (< (- (ido-time-stamp) time) ido-cache-ftp-work-directory-time))))
+(defun ido-cache-unc-valid (&optional time)
+(and (numberp ido-cache-unc-host-shares-time)
+(> ido-cache-unc-host-shares-time 0)
+(or (not time)
+	   (< (- (ido-time-stamp) time) ido-cache-unc-host-shares-time))))
 (defun ido-may-cache-directory (&optional dir)
 (setq dir (or dir ido-current-directory))
 (cond
 ((ido-directory-too-big-p dir)
 nil)
 ((and (ido-is-root-directory dir)
 	 (or ido-enable-tramp-completion
 	     (memq system-type '(windows-nt ms-dos))))
 nil)
-((not (ido-is-ftp-directory dir))
+((ido-is-unc-host dir)
-t)
+(ido-cache-unc-valid))
-((ido-cache-ftp-valid)
+((ido-is-ftp-directory dir)
-t)))
+(ido-cache-ftp-valid))
+(t t)))
 (defun ido-pp (list &optional sep)
 (let ((print-level nil) (eval-expression-print-level nil)
 	(print-length nil) (eval-expression-print-length nil))
 (insert "\n;; ----- " (symbol-name list) " -----\n(\n ")
 				(time (car (cdr (car l))))
 				(files (cdr (cdr (car l)))))
 			    (and
 			     (stringp dir)
 			     (consp time)
-			     (if (integerp (car time))
+			     (cond
-				 (and (/= (car time) 0)
+			      ((integerp (car time))
-				      (integerp (car (cdr time)))
+			       (and (/= (car time) 0)
-				      (/= (car (cdr time)) 0)
+				    (integerp (car (cdr time)))
-				      (ido-may-cache-directory dir))
+				    (/= (car (cdr time)) 0)
-			       (and (eq (car time) 'ftp)
+				    (ido-may-cache-directory dir)))
-				    (numberp (cdr time))
+			      ((eq (car time) 'ftp)
+			       (and (numberp (cdr time))
 				    (ido-is-ftp-directory dir)
 				    (ido-cache-ftp-valid (cdr time))))
+			      ((eq (car time) 'unc)
+			       (and (numberp (cdr time))
+				    (ido-is-unc-host dir)
+				    (ido-cache-unc-valid (cdr time))))
+			      (t nil))
 			     (let ((s files) (ok t))
 			       (while s
 				 (if (stringp (car s))
 				     (setq s (cdr s))
 				   (setq s nil ok nil)))
 ;; Return t if dir is a directory, but not readable
 ;; Do not check for non-readable directories via tramp, as this causes a premature
 ;; connect on incomplete tramp paths (after entring just method:).
 (let ((ido-enable-tramp-completion nil))
 (and (ido-final-slash dir)
+	 (not (ido-is-unc-host dir))
 	 (file-directory-p dir)
 	 (not (file-readable-p dir)))))
 (defun ido-directory-too-big-p (dir)
 ;; Return t if dir is a directory, but too big to show
 ;; Do not check for non-readable directories via tramp, as this causes a premature
 ;; connect on incomplete tramp paths (after entring just method:).
 (let ((ido-enable-tramp-completion nil))
 (and (numberp ido-max-directory-size)
 	 (ido-final-slash dir)
+	 (not (ido-is-unc-host dir))
 	 (file-directory-p dir)
 	 (> (nth 7 (file-attributes dir)) ido-max-directory-size))))
 (defun ido-set-current-directory (dir &optional subdir no-merge)
 ;; Set ido's current directory to DIR or DIR/SUBDIR
 (when subdir
 (setq dir (concat dir subdir))
 (unless (and ido-enable-tramp-completion
 		 (string-match "\\`/[^/]*@\\'" dir))
 (setq dir (ido-final-slash dir t))))
-(if (equal dir ido-current-directory)
+(if (get-buffer ido-completion-buffer)
-nil
+(kill-buffer ido-completion-buffer))
+(cond
+((equal dir ido-current-directory)
+nil)
+((ido-is-unc-root dir)
+(ido-trace "unc" dir)
+(setq ido-current-directory dir)
+(setq ido-directory-nonreadable nil)
+(setq ido-directory-too-big nil)
+t)
+(t
 (ido-trace "cd" dir)
 (setq ido-current-directory dir)
 (if (get-buffer ido-completion-buffer)
 	(kill-buffer ido-completion-buffer))
 (setq ido-directory-nonreadable (ido-nonreadable-directory-p dir))
 (setq ido-directory-too-big (and (not ido-directory-nonreadable)
 				     (ido-directory-too-big-p dir)))
-t))
+t)))
 (defun ido-set-current-home (&optional dir)
 ;; Set ido's current directory to user's home directory
 (ido-set-current-directory (expand-file-name (or dir "~/"))))
 	  (ido-trace "tramp prefix" ido-selected)
 	  (if (ido-is-slow-ftp-host)
 	      (setq ido-exit 'fallback
 		    done t)
 	    (setq ido-set-default-item t)))
 	 ((or (string-match "[/\\][^/\\]" ido-selected)
 	      (and (memq system-type '(windows-nt ms-dos))
 		   (string-match "\\`.:" ido-selected)))
 	  (ido-set-current-directory (file-name-directory ido-selected))
 	  (setq ido-set-default-item t))
 ido-selected))
 (defun ido-edit-input ()
 "Edit absolute file name entered so far with ido; terminate by RET."
 (interactive)
-(setq ido-text-init ido-text)
+(setq ido-text-init (if ido-matches (car ido-matches) ido-text))
 (setq ido-exit 'edit)
 (exit-minibuffer))
 ;;; MAIN FUNCTIONS
 (defun ido-buffer-internal (method &optional fallback prompt default initial switch-cmd)
 (file-name-all-completions "" dir))))
 (defun ido-file-name-all-completions (dir)
 ;; Return name of all files in DIR
 ;; Uses and updates ido-dir-file-cache
-(if (and (numberp ido-max-dir-file-cache) (> ido-max-dir-file-cache 0)
+(cond
-	   (stringp dir) (> (length dir) 0)
+((ido-is-unc-root dir)
-	   (ido-may-cache-directory dir))
+(mapcar
-(let* ((cached (assoc dir ido-dir-file-cache))
+(lambda (host)
+(if (string-match "/\\'" host) host (concat host "/")))
+ido-unc-hosts))
+((and (numberp ido-max-dir-file-cache) (> ido-max-dir-file-cache 0)
+	 (stringp dir) (> (length dir) 0)
+	 (ido-may-cache-directory dir))
+(let* ((cached (assoc dir ido-dir-file-cache))
 	     (ctime (nth 1 cached))
 	     (ftp (ido-is-ftp-directory dir))
-	     (attr (if ftp nil (file-attributes dir)))
+	     (unc (ido-is-unc-host dir))
+	     (attr (if (or ftp unc) nil (file-attributes dir)))
 	     (mtime (nth 5 attr))
 	     valid)
 	(when cached 	    ; should we use the cached entry ?
-	  (if ftp
+	  (cond
-	      (setq valid (and (eq (car ctime) 'ftp)
+	   (ftp
-			       (ido-cache-ftp-valid (cdr ctime))))
+	    (setq valid (and (eq (car ctime) 'ftp)
+			     (ido-cache-ftp-valid (cdr ctime)))))
+	   (unc
+	    (setq valid (and (eq (car ctime) 'unc)
+			     (ido-cache-unc-valid (cdr ctime)))))
+	   (t
 	    (if attr
 		(setq valid (and (= (car ctime) (car mtime))
-				 (= (car (cdr ctime)) (car (cdr mtime)))))))
+				 (= (car (cdr ctime)) (car (cdr mtime))))))))
-	  (if (not valid)
+	  (unless valid
-	      (setq ido-dir-file-cache (delq cached ido-dir-file-cache)
+	    (setq ido-dir-file-cache (delq cached ido-dir-file-cache)
-		    cached nil)))
+		  cached nil)))
 	(unless cached
-	  (if (and ftp (file-readable-p dir))
+	  (cond
-	      (setq mtime (cons 'ftp (ido-time-stamp))))
+	   (unc
+	    (setq mtime (cons 'unc (ido-time-stamp))))
+	   ((and ftp (file-readable-p dir))
+	    (setq mtime (cons 'ftp (ido-time-stamp)))))
 	  (if mtime
 	      (setq cached (cons dir (cons mtime (ido-file-name-all-completions-1 dir)))
 		    ido-dir-file-cache (cons cached ido-dir-file-cache)))
 	  (if (> (length ido-dir-file-cache) ido-max-dir-file-cache)
 	      (setcdr (nthcdr (1- ido-max-dir-file-cache) ido-dir-file-cache) nil)))
 	(and cached
-	     (cdr (cdr cached))))
+	     (cdr (cdr cached)))))
-(ido-file-name-all-completions-1 dir)))
+(t
+(ido-file-name-all-completions-1 dir))))
 (defun ido-remove-cached-dir (dir)
 ;; Remove dir from ido-dir-file-cache
 (if (and ido-dir-file-cache
 	   (stringp dir) (> (length dir) 0))
 (defun ido-make-file-list-1 (dir &optional merged)
 ;; Return list of non-ignored files in DIR
 ;; If MERGED is non-nil, each file is cons'ed with DIR
-(and (or (ido-is-tramp-root dir) (file-directory-p dir))
+(and (or (ido-is-tramp-root dir) (ido-is-unc-root dir)
+	   (file-directory-p dir))
 (delq nil
 	     (mapcar
 	      (lambda (name)
 		(if (not (ido-ignore-item-p name ido-ignore-files t))
 		    (if merged (cons name dir) name)))
 	 ((= (length contents) 0)
 	  )
 	 ((= (length contents) 1)
-	  (when (and (ido-is-tramp-root) (string-equal contents "/"))
+	  (cond
+	   ((and (ido-is-tramp-root) (string-equal contents "/"))
 	    (ido-set-current-directory ido-current-directory contents)
 	    (setq refresh t))
-	  )
+	   ((and ido-unc-hosts (string-equal contents "/")
+		 (let ((ido-enable-tramp-completion nil))
+		   (ido-is-root-directory)))
+	    (ido-set-current-directory "//")
+	    (setq refresh t))
+	  ))
 	 ((and (string-match (if ido-enable-tramp-completion "..[:@]\\'" "..:\\'") contents)
 	       (ido-is-root-directory)) ;; Ange-ftp or tramp
 	  (ido-set-current-directory ido-current-directory contents)
 	  (when (ido-is-slow-ftp-host)

Mercurial > emacs

comparison lisp/ido.el @ 90370:e3bacb89536a