xemacs-beta: lisp/minibuf.el comparison

comparison lisp/minibuf.el @ 440:8de8e3f6228a r21-2-28

Import from CVS: tag r21-2-28

author	cvs
date	Mon, 13 Aug 2007 11:33:38 +0200
parents	84b14dcb0985
children	abe6d1db359e

comparison

equal deleted inserted replaced

-:357dd071b03c
+:8de8e3f6228a
 (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 "No following item in %s" minibuffer-history-variable))
+	     (error (if minibuffer-default
+			"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)
+(defun read-expression (prompt &optional initial-contents history default-value)
-"Return a Lisp object read using the minibuffer.
+"Return a Lisp object read using the minibuffer, prompting with PROMPT.
-Prompt with PROMPT.  If non-nil, optional second arg INITIAL-CONTENTS
+If non-nil, optional second arg INITIAL-CONTENTS is a string to insert
-is a string to insert in the minibuffer before reading.
+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 history nil default-value)))
-(defun eval-minibuffer (prompt &optional initial-contents history)
+(defun eval-minibuffer (prompt &optional initial-contents history default-value)
 "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.
-(eval (read-expression prompt initial-contents history)))
+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."
+(eval (read-expression prompt initial-contents history default-value)))
 ;; The name `command-history' is already taken
 (defvar read-command-history '())
-(defun read-command (prompt)
+(defun read-command (prompt &optional default-value)
 "Read the name of a command and return as a symbol.
-Prompts with PROMPT."
+Prompts with PROMPT.  By default, return DEFAULT-VALUE."
 (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)
+(defun read-function (prompt &optional default-value)
 "Read the name of a function and return as a symbol.
-Prompts with PROMPT."
+Prompts with PROMPT.  By default, return DEFAULT-VALUE."
 (intern (completing-read prompt obarray 'fboundp t nil
-			   'function-history)))
+			   'function-history default-value)))
-(defun read-variable (prompt)
+(defun read-variable (prompt &optional default-value)
 "Read the name of a user variable and return it as a symbol.
-Prompts with PROMPT.
+Prompts with PROMPT.  By default, return DEFAULT-VALUE.
 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 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,
 nil))))
 (if (bufferp result)
 (buffer-name result)
 result)))
-(defun read-number (prompt &optional integers-only)
+(defun read-number (prompt &optional integers-only default-value)
-"Read a number from the minibuffer."
+"Read a number from the minibuffer, prompting with PROMPT.
+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
-		       t)) ;no history
+		       nil nil default-value))
 		  (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)
+(defun read-shell-command (prompt &optional initial-input history default-value)
 "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
 (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.
+Fifth arg INITIAL-CONTENTS specifies text to start with.  If this is not
+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
-		  (if initial-contents (expand-file-name initial-contents dir)
+		  (and initial-contents
-		    buffer-file-name))
+		       (abbreviate-file-name (expand-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))

Mercurial > hg > xemacs-beta

comparison lisp/minibuf.el @ 440:8de8e3f6228a r21-2-28