xemacs-beta: lisp/minibuf.el comparison

comparison lisp/minibuf.el @ 380:8626e4521993 r21-2-5

Import from CVS: tag r21-2-5

author	cvs
date	Mon, 13 Aug 2007 11:07:10 +0200
parents	6240c7796c7a
children	aabb7f5b1c81

comparison

equal deleted inserted replaced

-:76b7d63099ad
+:8626e4521993
 ;;  (following|preceding)-char. -slb
 ;;; Code:
 (defgroup minibuffer nil
-"Controling the behaviour of the minibuffer."
+"Controling the behavior of the minibuffer."
 :group 'environment)
 (defcustom insert-default-directory t
 "*Non-nil means when reading a filename start with default dir in minibuffer."
 "Read a string from the minibuffer, prompting with string PROMPT.
 If optional second arg INITIAL-CONTENTS is non-nil, it is a string
 to be inserted into the minibuffer before reading input.
 If INITIAL-CONTENTS is (STRING . POSITION), the initial input
 is STRING, but point is placed POSITION characters into the string.
-Third arg KEYMAP is a keymap to use whilst reading;
+Third arg KEYMAP is a keymap to use while reading;
 if omitted or nil, the default is `minibuffer-local-map'.
 If fourth arg READ is non-nil, then interpret the result as a lisp object
 and return that object:
 in other words, do `(car (read-from-string INPUT-STRING))'
 Fifth arg HISTORY, if non-nil, specifies a history list
 (defun un-substitute-in-file-name (string)
 (let ((regexp "\\$")
 (olen (length string))
 new
 n o ch)
-(cond ((eq system-type 'vax-vms)
+(if (not (string-match regexp string))
-string)
+	string
-((not (string-match regexp string))
+(setq n 1)
-string)
+(while (string-match regexp string (match-end 0))
-(t
+	(setq n (1+ n)))
-(setq n 1)
+(setq new (make-string (+ olen n) ?$))
-(while (string-match regexp string (match-end 0))
+(setq n 0 o 0)
-(setq n (1+ n)))
+(while (< o olen)
-(setq new (make-string (+ olen n) ?$))
+	(setq ch (aref string o))
-(setq n 0 o 0)
+	(aset new n ch)
-(while (< o olen)
+	(setq o (1+ o) n (1+ n))
-(setq ch (aref string o))
+	(if (eq ch ?$)
-(aset new n ch)
+	    ;; already aset by make-string initial-value
-(setq o (1+ o) n (1+ n))
+	    (setq n (1+ n))))
-(if (eq ch ?$)
+new)))
-;; already aset by make-string initial-value
-(setq n (1+ n))))
-new))))
 (defun read-file-name-2 (history prompt dir default
 				 must-match initial-contents
 				 completer)
 (if (not dir)
 (cons (un-substitute-in-file-name
 			       (concat dir initial-contents))
 (length dir)))
 (t
 (un-substitute-in-file-name dir))))
-(val (let ((completion-ignore-case (or completion-ignore-case
+(val
-						(eq system-type 'vax-vms))))
 ;;  Hateful, broken, case-sensitive un*x
 ;;;                 (completing-read prompt
 ;;;                                  completer
 ;;;                                  dir
 ;;;                                  must-match
 ;;;                                  insert
 ;;;                                  history)
-		;; #### - this is essentially the guts of completing read.
+	  ;; #### - this is essentially the guts of completing read.
-		;; There should be an elegant way to pass a pair of keymaps to
+	  ;; There should be an elegant way to pass a pair of keymaps to
-		;; completing read, but this will do for now.  All sins are
+	  ;; completing read, but this will do for now.  All sins are
-		;; relative.  --Stig
+	  ;; relative.  --Stig
-		(let ((minibuffer-completion-table completer)
+	  (let ((minibuffer-completion-table completer)
-		      (minibuffer-completion-predicate dir)
+		(minibuffer-completion-predicate dir)
-		      (minibuffer-completion-confirm (if (eq must-match 't)
+		(minibuffer-completion-confirm (if (eq must-match 't)
-							 nil t))
+						   nil t))
-		      (last-exact-completion nil))
+		(last-exact-completion nil))
-		  (read-from-minibuffer prompt
+	    (read-from-minibuffer prompt
-					insert
+				  insert
-					(if (not must-match)
+				  (if (not must-match)
-					    read-file-name-map
+				      read-file-name-map
-					  read-file-name-must-match-map)
+				    read-file-name-must-match-map)
-					nil
+				  nil
-					history)))
+				  history))
 	      ))
 ;;;     ;; Kludge!  Put "/foo/bar" on history rather than "/default//foo/bar"
 ;;;     (let ((hist (cond ((not history) 'minibuffer-history)
 ;;;                       ((consp history) (car history))
 ;;;                       (t history))))
 start))))
 (head (substring string 0 (1- start)))
 (alist #'(lambda ()
 (mapcar #'(lambda (x)
 (cons (substring x 0 (string-match "=" x))
-'nil))
+nil))
 process-environment))))
 	(cond ((eq action 'lambda)
 nil)
 ((eq action 't)
 				    ;;####  -- need absolute-pathname-p
 				    (/= (aref p 0) ?/))
 			       (concat "$" p)
 (concat head "$" p)))
 (all-completions env (funcall alist))))
-(t ;; 'nil
+(t ;; nil
 ;; complete
 (let* ((e (funcall alist))
 (val (try-completion env e)))
 (cond ((stringp val)
 (if (string-match "[^A-Za-z0-9_]" val)
 (file-exists-p sstring)))))
 ((eq action 't)
 ;; all completions
 (mapcar #'un-substitute-in-file-name
 (file-name-all-completions name dir)))
-(t;; 'nil
+(t;; nil
 ;; complete
 (let* ((d (or dir default-directory))
 		    (val (file-name-completion name d)))
 (if (and (eq val 't)
 (not (null completion-ignored-extensions)))
 				   nil
 				   (concat "\\`" (regexp-quote name))
 				   nil
 				   'directories))))
 			 (mapcar fn
-				 (cond ((eq system-type 'vax-vms)
+				 ;; Wretched unix
-					l)
+				 (delete "." l))))))
-				       (t
-					;; Wretched unix
-					(delete "." l))))))))
 (cond ((eq action 'lambda)
 ;; complete?
 (if (not orig)
 nil
 		 (file-directory-p string)))

Mercurial > hg > xemacs-beta

comparison lisp/minibuf.el @ 380:8626e4521993 r21-2-5