xemacs-beta: lisp/minibuf.el comparison

comparison lisp/minibuf.el @ 412:697ef44129c6 r21-2-14

Import from CVS: tag r21-2-14

author	cvs
date	Mon, 13 Aug 2007 11:20:41 +0200
parents	501cfd01ee6d
children	95016f13131a

comparison

equal deleted inserted replaced

-:12e008d41344
+:697ef44129c6
 ;;; minibuf.el --- Minibuffer functions for XEmacs
 ;; Copyright (C) 1992, 1993, 1994, 1997 Free Software Foundation, Inc.
-;; Copyright (C) 1995 Tinker Systems.
+;; Copyright (C) 1995 Tinker Systems
-;; Copyright (C) 1995, 1996, 2000 Ben Wing.
+;; Copyright (C) 1995, 1996 Ben Wing
 ;; Author: Richard Mlynarik
 ;; Created: 2-Oct-92
 ;; Maintainer: XEmacs Development Team
 ;; Keywords: internal, dumped
 "Within call to `completing-read', this holds the PREDICATE argument.")
 (defvar minibuffer-completion-confirm nil
 "Non-nil => demand confirmation of completion before exiting minibuffer.")
-(defcustom minibuffer-confirm-incomplete nil
+(defvar minibuffer-confirm-incomplete nil
 "If true, then in contexts where completing-read allows answers which
 are not valid completions, an extra RET must be typed to confirm the
-response.  This is helpful for catching typos, etc."
+response.  This is helpful for catching typos, etc.")
-:type 'boolean
-:group 'minibuffer)
 (defcustom completion-auto-help t
 "*Non-nil means automatically provide help for invalid completion input."
 :type 'boolean
 :group 'minibuffer)
 ;; Moved to C.  The minibuffer prompt must be setup before this is run
 ;; and that can only be done from the C side.
 ;(defvar minibuffer-setup-hook nil
 ;  "Normal hook run just after entry to minibuffer.")
-;; see comment at list-mode-hook.
-(put 'minibuffer-setup-hook 'permanent-local t)
 (defvar minibuffer-exit-hook nil
 "Normal hook run just after exit from minibuffer.")
-(put 'minibuffer-exit-hook 'permanent-local t)
 (defvar minibuffer-help-form nil
 "Value that `help-form' takes on inside the minibuffer.")
 (defvar minibuffer-default nil
 (defun read-from-minibuffer (prompt &optional initial-contents
 keymap
 readp
 history
-				    abbrev-table
+				    abbrev-table)
-				    default)
 "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.
 which INITIAL-CONTENTS corresponds to).
 If HISTORY is `t', no history will be recorded.
 Positions are counted starting from 1 at the beginning of the list.
 Sixth arg ABBREV-TABLE, if non-nil, becomes the value of `local-abbrev-table'
 in the minibuffer.
-Seventh arg DEFAULT, if non-nil, will be returned when user enters
-an empty string.
 See also the variable completion-highlight-first-word-only for control over
 completion display."
 (if (and (not enable-recursive-minibuffers)
 (> (minibuffer-depth) 0)
 (oconfig (current-window-configuration))
 	 ;; dynamic scope sucks sucks sucks sucks sucks sucks.
 	 ;; `M-x doctor' makes history a local variable, and thus
 	 ;; our binding above is buffer-local and doesn't apply
 	 ;; once we switch buffers!!!!  We demand better scope!
-	 (_history_ history)
+	 (_history_ history))
-	 (minibuffer-default default))
 (unwind-protect
 (progn
 (set-buffer (reset-buffer buffer))
 (setq default-directory dir)
 (make-local-variable 'print-escape-newlines)
 (signal 'quit '())
 ;; return value
 (let* ((val (progn (set-buffer buffer)
 (if minibuffer-exit-hook
 (run-hooks 'minibuffer-exit-hook))
-(if (and (eq (char-after (point-min)) nil)
+(buffer-string)))
-					   default)
+(histval val)
-				      default
-				    (buffer-string))))
-		      (histval (if (and default (string= val ""))
-				   default
-				 val))
 (err nil))
 (if readp
 (condition-case e
 (let ((v (read-from-string val)))
 (if (< (cdr v) (length val))
 ;;;; Guts of minibuffer completion
 ;; Used by minibuffer-do-completion
-(defvar last-exact-completion nil)
+(defvar last-exact-completion)
 (defun temp-minibuffer-message (m)
 (let ((savemax (point-max)))
 (save-excursion
 (goto-char (point-max))
 ;;;; completing-read
 (defun completing-read (prompt table
 &optional predicate require-match
-initial-contents history default)
+initial-contents history)
 "Read a string in the minibuffer, with completion.
 Args: PROMPT, TABLE, PREDICATE, REQUIRE-MATCH, INITIAL-CONTENTS, HISTORY.
 PROMPT is a string to prompt with; normally it ends in a colon and a space.
 TABLE is an alist whose elements' cars are strings, or an obarray.
 PREDICATE limits completion to a subset of TABLE.
 In that case, HISTVAR is the history list variable to use,
 and HISTPOS is the initial position (the position in the list
 which INITIAL-CONTENTS corresponds to).
 If HISTORY is `t', no history will be recorded.
 Positions are counted starting from 1 at the beginning of the list.
-DEFAULT, if non-nil, is the default value.
 Completion ignores case if the ambient value of
 `completion-ignore-case' is non-nil."
 (let ((minibuffer-completion-table table)
 (minibuffer-completion-predicate predicate)
 (minibuffer-completion-confirm (if (eq require-match 't) nil t))
-(last-exact-completion nil)
+(last-exact-completion nil))
-	ret)
+(read-from-minibuffer prompt
-(setq ret (read-from-minibuffer prompt
+initial-contents
-				    initial-contents
+(if (not require-match)
-				    (if (not require-match)
+minibuffer-local-completion-map
-					minibuffer-local-completion-map
+minibuffer-local-must-match-map)
-				      minibuffer-local-must-match-map)
+nil
-				    nil
+history)))
-				    history
-				    nil
-				    default))
-(if (and (string= ret "")
-	     default)
-	default
-ret)))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;                   Minibuffer completion commands                   ;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 \(Previous history elements refer to earlier actions.)
 With prefix argument N, search for Nth previous match.
 If N is negative, find the next or Nth next match."
 (interactive
 (let ((enable-recursive-minibuffers t)
-	 (minibuffer-history-sexp-flag nil)
+	 (minibuffer-history-sexp-flag nil))
-	 (minibuffer-max-depth (and minibuffer-max-depth
-				    (1+ minibuffer-max-depth))))
 (if (eq 't (symbol-value minibuffer-history-variable))
 	 (error "History is not being recorded in this context"))
 (list (read-from-minibuffer "Previous element matching (regexp): "
 				 (car minibuffer-history-search-history)
 				 minibuffer-local-map
 \(The next history element refers to a more recent action.)
 With prefix argument N, search for Nth next match.
 If N is negative, find the previous or Nth previous match."
 (interactive
 (let ((enable-recursive-minibuffers t)
-	 (minibuffer-history-sexp-flag nil)
+	 (minibuffer-history-sexp-flag nil))
-	 (minibuffer-max-depth (and minibuffer-max-depth
-				    (1+ minibuffer-max-depth))))
 (if (eq t (symbol-value minibuffer-history-variable))
 	 (error "History is not being recorded in this context"))
 (list (read-from-minibuffer "Next element matching (regexp): "
 				 (car minibuffer-history-search-history)
 				 minibuffer-local-map
 (setq current-minibuffer-contents (buffer-string)
 	    current-minibuffer-point (point)))
 (let ((narg (- minibuffer-history-position n))
 	  (minimum (if minibuffer-default -1 0)))
 (cond ((< narg minimum)
-	     (error (if minibuffer-default
+	     (error "No following item in %s" minibuffer-history-variable))
-			"No following item in %s"
-		      "No following item in %s; no default available")
-		    minibuffer-history-variable))
 	    ((> narg (length (symbol-value minibuffer-history-variable)))
 	     (error "No preceding item in %s" minibuffer-history-variable)))
 (erase-buffer)
 (setq minibuffer-history-position narg)
 (if (eq narg initial-minibuffer-history-position)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;                reading various things from a minibuffer            ;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(defun read-expression (prompt &optional initial-contents history default-value)
+(defun read-expression (prompt &optional initial-contents history)
-"Return a Lisp object read using the minibuffer, prompting with PROMPT.
+"Return a Lisp object read using the minibuffer.
-If non-nil, optional second arg INITIAL-CONTENTS is a string to insert
+Prompt with PROMPT.  If non-nil, optional second arg INITIAL-CONTENTS
-in the minibuffer before reading.
+is a string to insert in the minibuffer before reading.
-Third arg HISTORY, if non-nil, specifies a history list.
+Third arg HISTORY, if non-nil, specifies a history list."
-Fourth arg DEFAULT-VALUE is the default value.  If non-nil, it is used
-for history command, and as the value to return if the user enters the
-empty string."
 (let ((minibuffer-history-sexp-flag t)
 	;; Semi-kludge to get around M-x C-x o M-ESC trying to do completion.
 	(minibuffer-completion-table nil))
 (read-from-minibuffer prompt
 			  initial-contents
 			  read-expression-map
 			  t
 			  (or history 'read-expression-history)
-			  lisp-mode-abbrev-table
+			  lisp-mode-abbrev-table)))
-			  default-value)))
+(defun read-string (prompt &optional initial-contents history)
-(defun read-string (prompt &optional initial-contents history default-value)
 "Return a string from the minibuffer, prompting with string PROMPT.
 If non-nil, optional second arg INITIAL-CONTENTS is a string to insert
 in the minibuffer before reading.
-Third arg HISTORY, if non-nil, specifies a history list.
+Third arg HISTORY, if non-nil, specifies a history list."
-Fourth arg DEFAULT-VALUE is the default value.  If non-nil, it is used
-for history command, and as the value to return if the user enters the
-empty string."
 (let ((minibuffer-completion-table nil))
 (read-from-minibuffer prompt
 			  initial-contents
 			  minibuffer-local-map
-			  nil history nil default-value)))
+			  nil history)))
-(defun eval-minibuffer (prompt &optional initial-contents history default-value)
+(defun eval-minibuffer (prompt &optional initial-contents history)
 "Return value of Lisp expression read using the minibuffer.
 Prompt with PROMPT.  If non-nil, optional second arg INITIAL-CONTENTS
 is a string to insert in the minibuffer before reading.
-Third arg HISTORY, if non-nil, specifies a history list.
+Third arg HISTORY, if non-nil, specifies a history list."
-Fourth arg DEFAULT-VALUE is the default value.  If non-nil, it is used
+(eval (read-expression prompt initial-contents history)))
-for history command, and as the value to return if the user enters the
-empty string."
-(eval (read-expression prompt initial-contents history default-value)))
 ;; The name `command-history' is already taken
 (defvar read-command-history '())
-(defun read-command (prompt &optional default-value)
+(defun read-command (prompt)
 "Read the name of a command and return as a symbol.
-Prompts with PROMPT.  By default, return DEFAULT-VALUE."
+Prompts with PROMPT."
 (intern (completing-read prompt obarray 'commandp t nil
 			   ;; 'command-history is not right here: that's a
 			   ;; list of evalable forms, not a history list.
 			   'read-command-history
-			   default-value)))
+			   )))
-(defun read-function (prompt &optional default-value)
+(defun read-function (prompt)
 "Read the name of a function and return as a symbol.
-Prompts with PROMPT.  By default, return DEFAULT-VALUE."
+Prompts with PROMPT."
 (intern (completing-read prompt obarray 'fboundp t nil
-			   'function-history default-value)))
+			   'function-history)))
-(defun read-variable (prompt &optional default-value)
+(defun read-variable (prompt)
 "Read the name of a user variable and return it as a symbol.
-Prompts with PROMPT.  By default, return DEFAULT-VALUE.
+Prompts with PROMPT.
 A user variable is one whose documentation starts with a `*' character."
 (intern (completing-read prompt obarray 'user-variable-p t nil
-			   'variable-history
+			   'variable-history)))
-			   (if (symbolp default-value)
-			       (symbol-name default-value)
-			     default-value))))
 (defun read-buffer (prompt &optional default require-match)
 "Read the name of a buffer and return as a string.
 Prompts with PROMPT.  Optional second arg DEFAULT is value to return if user
 enters an empty line.  If optional third arg REQUIRE-MATCH is non-nil,
 (alist (mapcar #'(lambda (b) (cons (buffer-name b) b))
 (buffer-list)))
 result)
 (while (progn
 (setq result (completing-read prompt alist nil require-match
-					   nil 'buffer-history
+					   nil 'buffer-history))
-					   (if (bufferp default)
-					       (buffer-name default)
-					     default)))
 (cond ((not (equal result ""))
 nil)
 ((not require-match)
 (setq result default)
 nil)
 nil))))
 (if (bufferp result)
 (buffer-name result)
 result)))
-(defun read-number (prompt &optional integers-only default-value)
+(defun read-number (prompt &optional integers-only)
-"Read a number from the minibuffer, prompting with PROMPT.
+"Read a number from the minibuffer."
-If optional second argument INTEGERS-ONLY is non-nil, accept
-only integer input.
-If DEFAULT-VALUE is non-nil, return that if user enters an empty
-line."
 (let ((pred (if integers-only 'integerp 'numberp))
 	num)
 (while (not (funcall pred num))
 (setq num (condition-case ()
 		    (let ((minibuffer-completion-table nil))
 		      (read-from-minibuffer
 		       prompt (if num (prin1-to-string num)) nil t
-		       nil nil default-value))
+		       t)) ;no history
 		  (input-error nil)
 		  (invalid-read-syntax nil)
 		  (end-of-file nil)))
 (or (funcall pred num) (beep)))
 num))
-(defun read-shell-command (prompt &optional initial-input history default-value)
+(defun read-shell-command (prompt &optional initial-input history)
 "Just like read-string, but uses read-shell-command-map:
 \\{read-shell-command-map}"
 (let ((minibuffer-completion-table nil))
 (read-from-minibuffer prompt initial-input read-shell-command-map
-			  nil (or history 'shell-command-history)
+			  nil (or history 'shell-command-history))))
-			  nil default-value)))
 ;;; This read-file-name stuff probably belongs in files.el
 ;; Quote "$" as "$$" to get it past substitute-in-file-name
 	(setq o (1+ o) n (1+ n))
 	(if (eq ch ?$)
 	    ;; already aset by make-string initial-value
 	    (setq n (1+ n))))
 new)))
-;; Wrapper for `directory-files' for use in generating completion lists.
-;; Generates output in the same format as `file-name-all-completions'.
-;;
-;; The EFS replacement for `directory-files' doesn't support the FILES-ONLY
-;; option, so it has to be faked.  The listing cache will hopefully
-;; improve the performance of this operation.
-(defun minibuf-directory-files (dir &optional match-regexp files-only)
-(let ((want-file (or (eq files-only nil) (eq files-only t)))
-(want-dirs (or (eq files-only nil) (not (eq files-only t)))))
-(delete nil
-(mapcar (function (lambda (f)
-(if (file-directory-p (expand-file-name f dir))
-(and want-dirs (file-name-as-directory f))
-(and want-file f))))
-(delete "." (directory-files dir nil match-regexp))))))
 (defun read-file-name-2 (history prompt dir default
 				 must-match initial-contents
 				 completer)
 (if (not dir)
 				  insert
 				  (if (not must-match)
 				      read-file-name-map
 				    read-file-name-must-match-map)
 				  nil
-				  history
+				  history))
-				  nil
+	      ))
-				  default))))
 ;;;     ;; Kludge!  Put "/foo/bar" on history rather than "/default//foo/bar"
 ;;;     (let ((hist (cond ((not history) 'minibuffer-history)
 ;;;                       ((consp history) (car history))
 ;;;                       (t history))))
 ;;;       (if (and val
 (insert-string (file-name-as-directory
 		      (abbreviate-file-name full t)) minibuf)
 (reset-buffer completion-buf)
 (let ((standard-output completion-buf))
 	(display-completion-list
-(minibuf-directory-files full nil (if dir-p 'directory))
+	 (delete "." (directory-files full nil nil nil (if dir-p 'directory)))
 	 :user-data dir-p
 	 :reference-buffer minibuf
 	 :activate-callback 'read-file-name-activate-callback)
 	(goto-char (point-min) completion-buf)))))
 				 completer)
 (if (should-use-dialog-box-p)
 ;; this calls read-file-name-2
 (mouse-read-file-name-1 history prompt dir default must-match
 			      initial-contents completer)
-(add-one-shot-hook
+(let ((rfhookfun
-'minibuffer-setup-hook
+	   (lambda ()
-(lambda ()
+	     ;; #### SCREAM!  Create a `file-system-ignore-case'
-;; #### SCREAM!  Create a `file-system-ignore-case'
+	     ;; function, so this kind of stuff is generalized!
-;; function, so this kind of stuff is generalized!
+	     (and (eq system-type 'windows-nt)
-(and (eq system-type 'windows-nt)
+		  (set (make-local-variable 'completion-ignore-case) t))
-	    (set (make-local-variable 'completion-ignore-case) t))
+	     (set
-(set
+	      (make-local-variable
-	(make-local-variable
+	       'completion-display-completion-list-function)
-	 'completion-display-completion-list-function)
+	      #'(lambda (completions)
-	#'(lambda (completions)
+		  (display-completion-list
-	    (display-completion-list
+		   completions
-	     completions
+		   :user-data (not (eq completer 'read-file-name-internal))
-	     :user-data (not (eq completer 'read-file-name-internal))
+		   :activate-callback
-	     :activate-callback
+		   'read-file-name-activate-callback)))
-	     'read-file-name-activate-callback)))))
+	     ;; kludge!
-(read-file-name-2 history prompt dir default must-match
+	     (remove-hook 'minibuffer-setup-hook rfhookfun)
-		      initial-contents completer)))
+	     )))
+(unwind-protect
+	  (progn
+	    (add-hook 'minibuffer-setup-hook rfhookfun)
+	    (read-file-name-2 history prompt dir default must-match
+			      initial-contents completer))
+	(remove-hook 'minibuffer-setup-hook rfhookfun)))))
 (defun read-file-name (prompt
 &optional dir default must-match initial-contents
 		       history)
 "Read file name, prompting with PROMPT and completing in directory DIR.
 This will prompt with a dialog box if appropriate, according to
 `should-use-dialog-box-p'.
 Value is not expanded---you must call `expand-file-name' yourself.
-Value is subject to interpretation by `substitute-in-file-name' however.
+Value is subject to interpreted by substitute-in-file-name however.
 Default name to DEFAULT if user enters a null string.
 (If DEFAULT is omitted, the visited file name is used,
 except that if INITIAL-CONTENTS is specified, that combined with DIR is
 used.)
 Fourth arg MUST-MATCH non-nil means require existing file's name.
 Non-nil and non-t means also require confirmation after completion.
-Fifth arg INITIAL-CONTENTS specifies text to start with.  If this is not
+Fifth arg INITIAL-CONTENTS specifies text to start with.
-specified, and `insert-default-directory' is non-nil, DIR or the current
-directory will be used.
 Sixth arg HISTORY specifies the history list to use.  Default is
 `file-name-history'.
 DIR defaults to current buffer's directory default."
 (read-file-name-1
 (or history 'file-name-history)
 prompt dir (or default
-		  (and initial-contents
+		  (if initial-contents (expand-file-name initial-contents dir)
-		       (abbreviate-file-name (expand-file-name
+		    buffer-file-name))
-					      initial-contents dir) t))
-		  (and buffer-file-truename
-		       (abbreviate-file-name buffer-file-name t)))
 must-match initial-contents
 ;; A separate function (not an anonymous lambda-expression)
 ;; and passed as a symbol because of disgusting kludges in various
 ;; places which do stuff like (let ((filename-kludge-p (eq minibuffer-completion-table 'read-file-name-internal))) ...)
 'read-file-name-internal))
 nil
 (file-exists-p sstring)))))
 ((eq action 't)
 ;; all completions
 (mapcar #'un-substitute-in-file-name
-(if (string= name "")
+(file-name-all-completions name dir)))
-(delete "./" (file-name-all-completions "" dir))
-(file-name-all-completions name dir))))
 (t;; nil
 ;; complete
 (let* ((d (or dir default-directory))
 		    (val (file-name-completion name d)))
 (if (and (eq val 't)
 (read-file-name-internal-1
 string dir action
 #'(lambda (action orig string specdir dir name)
 (let* ((dirs #'(lambda (fn)
 		       (let ((l (if (equal name "")
-				    (minibuf-directory-files
+				    (directory-files
 				     dir
+				     nil
 				     ""
+				     nil
 				     'directories)
-				  (minibuf-directory-files
+				  (directory-files
 				   dir
+				   nil
 				   (concat "\\`" (regexp-quote name))
+				   nil
 				   'directories))))
 			 (mapcar fn
 				 ;; Wretched unix
 				 (delete "." l))))))
 (cond ((eq action 'lambda)
 					 (error file))
 				       "" nil))))
 	   result)
 	  (t file))))
-(defun mouse-rfn-setup-vars (prompt)
-;; a specifier would be nice.
-(set (make-local-variable 'frame-title-format)
-(capitalize-string-as-title
-	;; Delete ": " off the end.  There must be an easier way!
-	(let ((end-pos (length prompt)))
-	  (if (and (> end-pos 0) (eq (aref prompt (1- end-pos)) ? ))
-	      (setq end-pos (1- end-pos)))
-	  (if (and (> end-pos 0) (eq (aref prompt (1- end-pos)) ?:))
-	      (setq end-pos (1- end-pos)))
-	  (substring prompt 0 end-pos))))
-;; ensure that killing the frame works right,
-;; instead of leaving us in the minibuffer.
-(add-local-hook 'delete-frame-hook
-		  #'(lambda (frame)
-		      (abort-recursive-edit))))
 (defun mouse-file-display-completion-list (window dir minibuf user-data)
 (let ((standard-output (window-buffer window)))
 (condition-case nil
 	(display-completion-list
-	 (minibuf-directory-files dir nil t)
+	 (directory-files dir nil nil nil t)
-	 :window-width (window-width window)
+	 :window-width (* 2 (window-width window))
-	 :window-height (window-text-area-height window)
-	 :completion-string ""
 	 :activate-callback
 	 'mouse-read-file-name-activate-callback
 	 :user-data user-data
 	 :reference-buffer minibuf
 	 :help-string "")
-(t nil))
+(t nil))))
-))
 (defun mouse-directory-display-completion-list (window dir minibuf user-data)
 (let ((standard-output (window-buffer window)))
 (condition-case nil
 	(display-completion-list
-	 (minibuf-directory-files dir nil 1)
+	 (delete "." (directory-files dir nil nil nil 1))
 	 :window-width (window-width window)
-	 :window-height (window-text-area-height window)
-	 :completion-string ""
 	 :activate-callback
 	 'mouse-read-file-name-activate-callback
 	 :user-data user-data
 	 :reference-buffer minibuf
 	 :help-string "")
-(t nil))
+(t nil))))
-))
 (defun mouse-read-file-name-activate-callback (event extent user-data)
 (let* ((file (extent-string extent))
 	 (minibuf (symbol-value-in-buffer 'completion-reference-buffer
 					  (extent-object extent)))
-	 (ministring (buffer-substring nil nil minibuf))
+	 (in-dir (buffer-substring nil nil minibuf))
-	 (in-dir (file-name-directory ministring))
 	 (full (expand-file-name file in-dir))
 	 (filebuf (nth 0 user-data))
-	 (dirbuf (nth 1 user-data))
+	 (dirbuff (nth 1 user-data))
 	 (filewin (nth 2 user-data))
 	 (dirwin (nth 3 user-data)))
 (if (file-regular-p full)
 	(default-choose-completion event extent minibuf)
 (erase-buffer minibuf)
 (insert-string (file-name-as-directory
 		      (abbreviate-file-name full t)) minibuf)
 (reset-buffer filebuf)
-(if (not dirbuf)
+(if (not dirbuff)
 	  (mouse-directory-display-completion-list filewin full minibuf
 						   user-data)
 	(mouse-file-display-completion-list filewin full minibuf user-data)
-	(reset-buffer dirbuf)
+	(reset-buffer dirbuff)
 	(mouse-directory-display-completion-list dirwin full minibuf
 						 user-data)))))
-;; our cheesy but god-awful time consuming file dialog box implementation.
+;; this is rather cheesified but gets the job done.
-;; this will be replaced with use of the native file dialog box (when
-;; available).
 (defun mouse-read-file-name-1 (history prompt dir default
-				       must-match initial-contents
+				 must-match initial-contents
-				       completer)
+				 completer)
-;; file-p is t if we're reading files, nil if directories.
 (let* ((file-p (eq 'read-file-name-internal completer))
 	 (filebuf (get-buffer-create "*Completions*"))
-	 (dirbuf (and file-p (generate-new-buffer " *mouse-read-file*")))
+	 (dirbuff (and file-p (generate-new-buffer " *mouse-read-file*")))
-	 (butbuf (generate-new-buffer " *mouse-read-file*"))
+	 (butbuff (generate-new-buffer " *mouse-read-file*"))
 	 (frame (make-dialog-frame))
 	 filewin dirwin
 	 user-data)
 (unwind-protect
 	(progn
 	  (reset-buffer filebuf)
+	  (select-frame frame)
-	  ;; set up the frame.
-	  (focus-frame frame)
 	  (let ((window-min-height 1))
 	    ;; #### should be 2 not 3, but that causes
 	    ;; "window too small to split" errors for some
 	    ;; people (but not for me ...) There's a more
 	    ;; fundamental bug somewhere.
 	      (progn
 		(split-window-horizontally 16)
 		(setq filewin (frame-rightmost-window frame)
 		      dirwin (frame-leftmost-window frame))
 		(set-window-buffer filewin filebuf)
-		(set-window-buffer dirwin dirbuf))
+		(set-window-buffer dirwin dirbuff))
 	    (setq filewin (frame-highest-window frame))
 	    (set-window-buffer filewin filebuf))
-	  (setq user-data (list filebuf dirbuf filewin dirwin))
+	  (setq user-data (list filebuf dirbuff filewin dirwin))
-	  (set-window-buffer (frame-lowest-window frame) butbuf)
+	  (set-window-buffer (frame-lowest-window frame) butbuff)
+	  (set-buffer butbuff)
-	  ;; set up completion buffers.
-	  (let ((rfcshookfun
-		 ;; kludge!
-		 ;; #### I really need to flesh out the object
-		 ;; hierarchy better to avoid these kludges.
-		 ;; (?? I wrote this comment above some time ago,
-		 ;; and I don't understand what I'm referring to
-		 ;; any more. --ben
-		 (lambda ()
-		   (mouse-rfn-setup-vars prompt)
-		   (when (featurep 'scrollbar)
-		     (set-specifier scrollbar-width 0 (current-buffer)))
-		   (setq truncate-lines t))))
-	    (set-buffer filebuf)
-	    (add-local-hook 'completion-setup-hook rfcshookfun)
-	    (when file-p
-	      (set-buffer dirbuf)
-	      (add-local-hook 'completion-setup-hook rfcshookfun)))
-	  ;; set up minibuffer.
-	  (add-one-shot-hook
-	   'minibuffer-setup-hook
-	   (lambda ()
-	     (if (not file-p)
-		 (mouse-directory-display-completion-list
-		  filewin dir (current-buffer) user-data)
-	       (mouse-file-display-completion-list
-		filewin dir (current-buffer) user-data)
-	       (mouse-directory-display-completion-list
-		dirwin dir (current-buffer) user-data))
-	     (set
-	      (make-local-variable
-	       'completion-display-completion-list-function)
-	      (lambda (completions)
-		(display-completion-list
-		 completions
-		 :help-string ""
-		 :window-width (window-width filewin)
-		 :window-height (window-text-area-height filewin)
-		 :completion-string ""
-		 :activate-callback
-		 'mouse-read-file-name-activate-callback
-		 :user-data user-data)))
-	     (mouse-rfn-setup-vars prompt)
-	     (save-selected-window
-	       ;; kludge to ensure the frame title is correct.
-	       ;; the minibuffer leaves the frame title the way
-	       ;; it was before (i.e. of the selected window before
-	       ;; the dialog box was opened), so to get it correct
-	       ;; we have to be tricky.
-	       (select-window filewin)
-	       (redisplay-frame nil t)
-	       ;; #### another kludge.  sometimes the focus ends up
-	       ;; back in the main window, not the dialog box.  it
-	       ;; occurs randomly and it's not possible to reliably
-	       ;; reproduce.  We try to fix it by draining non-user
-	       ;; events and then setting the focus back on the frame.
-	       (sit-for 0 t)
-	       (focus-frame frame))))
-	  ;; set up button buffer.
-	  (set-buffer butbuf)
-	  (mouse-rfn-setup-vars prompt)
 	  (when dir
 	    (setq default-directory dir))
 	  (when (featurep 'scrollbar)
-	    (set-specifier scrollbar-width 0 butbuf))
+	    (set-specifier scrollbar-width 0 butbuff))
 	  (insert "                 ")
 	  (insert-gui-button (make-gui-button "OK"
 					      (lambda (foo)
 						(exit-minibuffer))))
 	  (insert "                 ")
 	  (insert-gui-button (make-gui-button "Cancel"
 					      (lambda (foo)
 						(abort-recursive-edit))))
+	  (let ((rfhookfun
-	  ;; now start reading filename.
+		 (lambda ()
-	  (read-file-name-2 history prompt dir default
+		   (if (not file-p)
-			    must-match initial-contents
+		       (mouse-directory-display-completion-list
-			    completer))
+			filewin dir (current-buffer) user-data)
+		     (mouse-file-display-completion-list filewin dir
-;; always clean up.
+							 (current-buffer)
-;; get rid of our hook that calls abort-recursive-edit -- not a good
+							 user-data)
-;; idea here.
+		     (mouse-directory-display-completion-list dirwin dir
-(kill-local-variable 'delete-frame-hook)
+							      (current-buffer)
+							      user-data))
+		   (set
+		    (make-local-variable
+		     'completion-display-completion-list-function)
+		    #'(lambda (completions)
+			(display-completion-list
+			 completions
+			 :help-string ""
+			 :activate-callback
+			 'mouse-read-file-name-activate-callback
+			 :user-data user-data)))
+		   ;; kludge!
+		   (remove-hook 'minibuffer-setup-hook rfhookfun)
+		   ))
+		(rfcshookfun
+		 ;; kludge!
+		 ;; #### I really need to flesh out the object
+		 ;; hierarchy better to avoid these kludges.
+		 (lambda ()
+		   (save-excursion
+		     (set-buffer standard-output)
+		     (setq truncate-lines t)))))
+	    (unwind-protect
+		(progn
+		  (add-hook 'minibuffer-setup-hook rfhookfun)
+		  (add-hook 'completion-setup-hook rfcshookfun)
+		  (read-file-name-2 history prompt dir default
+				    must-match initial-contents
+				    completer))
+	      (remove-hook 'minibuffer-setup-hook rfhookfun)
+	      (remove-hook 'completion-setup-hook rfcshookfun))))
 (delete-frame frame)
 (kill-buffer filebuf)
-(kill-buffer butbuf)
+(kill-buffer butbuff)
-(and dirbuf (kill-buffer dirbuf)))))
+(and dirbuff (kill-buffer dirbuff)))))
 (defun read-face (prompt &optional must-match)
 "Read the name of a face from the minibuffer and return it as a symbol."
 (intern (completing-read prompt obarray 'find-face must-match)))
 ;; only include these if the mule feature is present.  Strangely,
 ;; read-coding-system doesn't.
 ;;(if (featurep 'mule)
-(defun read-coding-system (prompt &optional default-coding-system)
+(defun read-coding-system (prompt)
 "Read a coding-system (or nil) from the minibuffer.
-Prompting with string PROMPT.
+Prompting with string PROMPT."
-If the user enters null input, return second argument DEFAULT-CODING-SYSTEM.
+(intern (completing-read prompt obarray 'find-coding-system t)))
-DEFAULT-CODING-SYSTEM can be a string, symbol, or coding-system object."
-(intern (completing-read prompt obarray 'find-coding-system t nil nil
-			   (cond ((symbolp default-coding-system)
-				  (symbol-name default-coding-system))
-				 ((coding-system-p default-coding-system)
-				  (symbol-name (coding-system-name default-coding-system)))
-				 (t
-				  default-coding-system)))))
 (defun read-non-nil-coding-system (prompt)
 "Read a non-nil coding-system from the minibuffer.
 Prompt with string PROMPT."
 (let ((retval (intern "")))

Mercurial > hg > xemacs-beta

comparison lisp/minibuf.el @ 412:697ef44129c6 r21-2-14