procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace "(default %s)" with 'format-prompt'

Browse source 
* lisp/cmuscheme.el (scheme-load-file, scheme-compile-file):
* lisp/comint.el (comint-get-source):
* lisp/emulation/viper-cmd.el (viper-quote-region, viper-kill-buffer)
(viper-query-replace, viper-read-string-with-history):
* lisp/eshell/esh-mode.el (eshell-find-tag):
* lisp/gnus/gnus-sum.el (gnus-articles-to-read)
(gnus-summary-search-article-forward)
(gnus-summary-search-article-backward):
* lisp/international/mule-cmds.el (set-input-method, toggle-input-method)
(describe-input-method, set-language-environment)
(describe-language-environment):
* lisp/mh-e/mh-gnus.el (mh-mml-minibuffer-read-disposition):
* lisp/mh-e/mh-letter.el (mh-insert-letter):
* lisp/mh-e/mh-mime.el (mh-display-with-external-viewer)
(mh-mime-save-parts, mh-mh-forward-message)
(mh-mml-query-cryptographic-method, mh-minibuffer-read-type):
* lisp/mh-e/mh-seq.el (mh-read-seq, mh-read-range):
* lisp/mh-e/mh-utils.el (mh-prompt-for-folder):
* lisp/progmodes/etags.el (find-tag-tag):
(find-tag-noselect, find-tag, find-tag-other-window)
(find-tag-other-frame, find-tag-regexp):
* lisp/progmodes/idlwave.el (idlwave-find-module):
* lisp/progmodes/inf-lisp.el (lisp-load-file, lisp-compile-file):
* lisp/progmodes/tcl.el (tcl-load-file, tcl-restart-with-file):
* lisp/progmodes/xref.el (xref--read-identifier):
(xref-find-definitions, xref-find-definitions-other-window)
(xref-find-definitions-other-frame, xref-find-references):
* lisp/ses.el (ses-read-printer):
(ses-read-cell-printer, ses-read-column-printer)
(ses-read-default-printer, ses-define-local-printer):
* lisp/subr.el (read-number):
* lisp/term.el (term-get-source):
* src/minibuf.c (read-buffer): Remove prompt suffix and
use 'format-prompt'.
* lisp/minibuffer.el (format-prompt): Ignore DEFAULT empty strings
(bug#47286).
This commit is contained in:
Gabriel do Nascimento Ribeiro 2021-03-24 10:31:31 +01:00 • committed by Lars Ingebrigtsen
parent 8d33413245
commit 50512e36c7
21 changed files with 83 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/cmuscheme.el
View file

@ -421,7 +421,7 @@ in the next one.")
(defun scheme-load-file (file-name) (defun scheme-load-file (file-name)
"Load a Scheme file FILE-NAME into the inferior Scheme process." "Load a Scheme file FILE-NAME into the inferior Scheme process."
(interactive (comint-get-source "Load Scheme file: " scheme-prev-l/c-dir/file (interactive (comint-get-source "Load Scheme file" scheme-prev-l/c-dir/file
scheme-source-modes t)) ; t because `load' scheme-source-modes t)) ; t because `load'
; needs an exact name ; needs an exact name
(comint-check-source file-name) ; Check to see if buffer needs saved. (comint-check-source file-name) ; Check to see if buffer needs saved.
@ -433,7 +433,7 @@ in the next one.")
(defun scheme-compile-file (file-name) (defun scheme-compile-file (file-name)
"Compile a Scheme file FILE-NAME in the inferior Scheme process." "Compile a Scheme file FILE-NAME in the inferior Scheme process."
(interactive (comint-get-source "Compile Scheme file: " (interactive (comint-get-source "Compile Scheme file"
scheme-prev-l/c-dir/file scheme-prev-l/c-dir/file
scheme-source-modes scheme-source-modes
nil)) ; nil because COMPILE doesn't nil)) ; nil because COMPILE doesn't

6
lisp/comint.el
View file

@ -2946,7 +2946,7 @@ two arguments are used for determining defaults.) If MUSTMATCH-P is true,
then the filename reader will only accept a file that exists. then the filename reader will only accept a file that exists.
A typical use: A typical use:
(interactive (comint-get-source \"Compile file: \" prev-lisp-dir/file (interactive (comint-get-source \"Compile file\" prev-lisp-dir/file
\\='(lisp-mode) t))" \\='(lisp-mode) t))"
(let* ((def (comint-source-default prev-dir/file source-modes)) (let* ((def (comint-source-default prev-dir/file source-modes))
(stringfile (comint-extract-string)) (stringfile (comint-extract-string))
@ -2959,9 +2959,7 @@ A typical use:
(car def))) (car def)))
(deffile (if sfile-p (file-name-nondirectory stringfile) (deffile (if sfile-p (file-name-nondirectory stringfile)
(cdr def))) (cdr def)))
(ans (read-file-name (if deffile (format "%s(default %s) " (ans (read-file-name (format-prompt prompt deffile)
prompt deffile)
prompt)
defdir defdir
(concat defdir deffile) (concat defdir deffile)
mustmatch-p))) mustmatch-p)))

31
lisp/emulation/viper-cmd.el
View file

@ -1786,7 +1786,7 @@ Undo previous insertion and inserts new."
(do-not-change-default t)) (do-not-change-default t))
(setq quote-str (setq quote-str
(viper-read-string-with-history (viper-read-string-with-history
"Quote string: " "Quote string"
nil nil
'viper-quote-region-history 'viper-quote-region-history
;; FIXME: Use comment-region. ;; FIXME: Use comment-region.
@ -1995,24 +1995,17 @@ problems."
#'viper-minibuffer-standard-hook #'viper-minibuffer-standard-hook
(if (or (not (listp old)) (eq (car old) 'lambda)) (if (or (not (listp old)) (eq (car old) 'lambda))
(list old) old)))) (list old) old))))
(val "") (val ""))
(padding "")
temp-msg)
(setq keymap (or keymap minibuffer-local-map) (setq keymap (or keymap minibuffer-local-map)
initial (or initial "") initial (or initial "")
viper-initial initial viper-initial initial)
temp-msg (if default
(format "(default %s) " default)
""))
(setq viper-incomplete-ex-cmd nil) (setq viper-incomplete-ex-cmd nil)
(setq val (read-from-minibuffer prompt (setq val (read-from-minibuffer (format-prompt prompt default)
(concat temp-msg initial val padding) nil
keymap nil history-var)) keymap nil history-var default))
(setq minibuffer-setup-hook nil (setq minibuffer-setup-hook nil)
padding (viper-array-to-string (this-command-keys))
temp-msg "")
;; the following tries to be smart about what to put in history ;; the following tries to be smart about what to put in history
(if (not (string= val (car (symbol-value history-var)))) (if (not (string= val (car (symbol-value history-var))))
(push val (symbol-value history-var))) (push val (symbol-value history-var)))
@ -3825,7 +3818,7 @@ Null string will repeat previous search."
(let (buffer buffer-name) (let (buffer buffer-name)
(setq buffer-name (setq buffer-name
(funcall viper-read-buffer-function (funcall viper-read-buffer-function
(format "Kill buffer (%s): " (format-prompt "Kill buffer"
(buffer-name (current-buffer))))) (buffer-name (current-buffer)))))
(setq buffer (setq buffer
(if (null buffer-name) (if (null buffer-name)
@ -4171,8 +4164,8 @@ and regexp replace."
(interactive) (interactive)
(let (str) (let (str)
(setq str (viper-read-string-with-history (setq str (viper-read-string-with-history
(if viper-re-query-replace "Query replace regexp: " (if viper-re-query-replace "Query replace regexp"
"Query replace: ") "Query replace")
nil ; no initial nil ; no initial
'viper-replace1-history 'viper-replace1-history
(car viper-replace1-history) ; default (car viper-replace1-history) ; default
@ -4187,7 +4180,7 @@ and regexp replace."
(query-replace-regexp (query-replace-regexp
str str
(viper-read-string-with-history (viper-read-string-with-history
(format-message "Query replace regexp `%s' with: " str) (format-message "Query replace regexp `%s' with" str)
nil ; no initial nil ; no initial
'viper-replace1-history 'viper-replace1-history
(car viper-replace1-history) ; default (car viper-replace1-history) ; default
@ -4195,7 +4188,7 @@ and regexp replace."
(query-replace (query-replace
str str
(viper-read-string-with-history (viper-read-string-with-history
(format-message "Query replace `%s' with: " str) (format-message "Query replace `%s' with" str)
nil ; no initial nil ; no initial
'viper-replace1-history 'viper-replace1-history
(car viper-replace1-history) ; default (car viper-replace1-history) ; default

2
lisp/eshell/esh-mode.el
View file

@ -458,7 +458,7 @@ and the hook `eshell-exit-hook'."
(let ((inhibit-read-only t) (let ((inhibit-read-only t)
(no-default (eobp)) (no-default (eobp))
(find-tag-default-function 'ignore)) (find-tag-default-function 'ignore))
(setq tagname (car (find-tag-interactive "Find tag: " no-default))) (setq tagname (car (find-tag-interactive "Find tag" no-default)))
(with-suppressed-warnings ((obsolete find-tag)) (with-suppressed-warnings ((obsolete find-tag))
(find-tag tagname next-p regexp-p)))) (find-tag tagname next-p regexp-p))))

31
lisp/gnus/gnus-sum.el
View file

@ -5977,14 +5977,15 @@ If SELECT-ARTICLES, only select those articles from GROUP."
(input (input
(read-string (read-string
(if only-read-p (if only-read-p
(format (format-prompt
"How many articles from %s (available %d, default %d): " "How many articles from %s (available %d)"
(gnus-group-real-name gnus-newsgroup-name) default
number default) (gnus-group-real-name gnus-newsgroup-name)
(format number)
"How many articles from %s (%d default): " (format-prompt
(gnus-group-real-name gnus-newsgroup-name) "How many articles from %s"
default)) default
(gnus-group-real-name gnus-newsgroup-name)))
nil nil
nil nil
(number-to-string default)))) (number-to-string default))))
@ -9514,11 +9515,9 @@ If BACKWARD, search backward instead."
(interactive (interactive
(list (list
(read-string (read-string
(format "Search article %s (regexp%s): " (format-prompt "Search article %s (regexp)"
(if current-prefix-arg "backward" "forward") gnus-last-search-regexp
(if gnus-last-search-regexp (if current-prefix-arg "backward" "forward")))
(concat ", default " gnus-last-search-regexp)
"")))
current-prefix-arg) current-prefix-arg)
gnus-summary-mode) gnus-summary-mode)
(if (string-equal regexp "") (if (string-equal regexp "")
@ -9537,10 +9536,8 @@ If BACKWARD, search backward instead."
(interactive (interactive
(list (list
(read-string (read-string
(format "Search article backward (regexp%s): " (format-prompt "Search article backward (regexp)"
(if gnus-last-search-regexp gnus-last-search-regexp)))
(concat ", default " gnus-last-search-regexp)
""))))
gnus-summary-mode) gnus-summary-mode)
(gnus-summary-search-article-forward regexp 'backward)) (gnus-summary-search-article-forward regexp 'backward))

10
lisp/international/mule-cmds.el
View file

@ -1524,7 +1524,7 @@ To deactivate it programmatically, use `deactivate-input-method'."
(interactive (interactive
(let* ((default (or (car input-method-history) default-input-method))) (let* ((default (or (car input-method-history) default-input-method)))
(list (read-input-method-name (list (read-input-method-name
(if default "Select input method (default %s): " "Select input method: ") (format-prompt "Select input method" default)
default t) default t)
t))) t)))
(activate-input-method input-method) (activate-input-method input-method)
@ -1569,7 +1569,7 @@ which marks the variable `default-input-method' as set for Custom buffers."
(if (or arg (not default)) (if (or arg (not default))
(progn (progn
(read-input-method-name (read-input-method-name
(if default "Input method (default %s): " "Input method: " ) (format-prompt "Input method" default)
default t)) default t))
default)) default))
(unless default-input-method (unless default-input-method
@ -1620,7 +1620,7 @@ If `default-transient-input-method' was not yet defined, prompt for it."
"Describe input method INPUT-METHOD." "Describe input method INPUT-METHOD."
(interactive (interactive
(list (read-input-method-name (list (read-input-method-name
"Describe input method (default current choice): "))) (format-prompt "Describe input method" current-input-method))))
(if (and input-method (symbolp input-method)) (if (and input-method (symbolp input-method))
(setq input-method (symbol-name input-method))) (setq input-method (symbol-name input-method)))
(help-setup-xref (list #'describe-input-method (help-setup-xref (list #'describe-input-method
@ -1929,7 +1929,7 @@ runs the hook `exit-language-environment-hook'. After setting up
the new language environment, it runs `set-language-environment-hook'." the new language environment, it runs `set-language-environment-hook'."
(interactive (list (read-language-name (interactive (list (read-language-name
nil nil
"Set language environment (default English): "))) (format-prompt "Set language environment" "English"))))
(if language-name (if language-name
(if (symbolp language-name) (if (symbolp language-name)
(setq language-name (symbol-name language-name))) (setq language-name (symbol-name language-name)))
@ -2144,7 +2144,7 @@ See `set-language-info-alist' for use in programs."
(interactive (interactive
(list (read-language-name (list (read-language-name
'documentation 'documentation
"Describe language environment (default current choice): "))) (format-prompt "Describe language environment" current-language-environment))))
(if (null language-name) (if (null language-name)
(setq language-name current-language-environment)) (setq language-name current-language-environment))
(if (or (null language-name) (if (or (null language-name)

2
lisp/mh-e/mh-gnus.el
View file

@ -129,7 +129,7 @@
(unless default (unless default
(setq default (mml-content-disposition type filename))) (setq default (mml-content-disposition type filename)))
(let ((disposition (completing-read (let ((disposition (completing-read
(format "Disposition (default %s): " default) (format-prompt "Disposition" default)
'(("attachment") ("inline") ("")) '(("attachment") ("inline") (""))
nil t nil nil default))) nil t nil nil default)))
(if (not (equal disposition "")) (if (not (equal disposition ""))

5
lisp/mh-e/mh-letter.el
View file

@ -390,10 +390,7 @@ This command leaves the mark before the letter and point after it."
(or mh-sent-from-msg (nth 0 (mh-translate-range folder "cur"))) (or mh-sent-from-msg (nth 0 (mh-translate-range folder "cur")))
(nth 0 (mh-translate-range folder "cur")))) (nth 0 (mh-translate-range folder "cur"))))
(message (message
(read-string (concat "Message number" (read-string (format-prompt "Message number" default)
(or (and default
(format " (default %d): " default))
": "))
nil nil nil nil
(if (numberp default) (if (numberp default)
(int-to-string default) (int-to-string default)

20
lisp/mh-e/mh-mime.el
View file

@ -259,9 +259,7 @@ usually reads the file \"/etc/mailcap\"."
(methods (mapcar (lambda (x) (list (cdr (assoc 'viewer x)))) (methods (mapcar (lambda (x) (list (cdr (assoc 'viewer x))))
(mailcap-mime-info type 'all))) (mailcap-mime-info type 'all)))
(def (caar methods)) (def (caar methods))
(prompt (format "Viewer%s: " (if def (prompt (format-prompt "Viewer" def))
(format " (default %s)" def)
"")))
(method (completing-read prompt methods nil nil nil nil def)) (method (completing-read prompt methods nil nil nil nil def))
(folder mh-show-folder-buffer) (folder mh-show-folder-buffer)
(buffer-read-only nil)) (buffer-read-only nil))
@ -395,9 +393,9 @@ do the work."
((and (or prompt ((and (or prompt
(equal t mh-mime-save-parts-default-directory)) (equal t mh-mime-save-parts-default-directory))
mh-mime-save-parts-directory) mh-mime-save-parts-directory)
(read-directory-name (format (read-directory-name (format-prompt
"Store in directory (default %s): " "Store in directory"
mh-mime-save-parts-directory) mh-mime-save-parts-directory)
"" mh-mime-save-parts-directory t "")) "" mh-mime-save-parts-directory t ""))
((stringp mh-mime-save-parts-default-directory) ((stringp mh-mime-save-parts-default-directory)
mh-mime-save-parts-default-directory) mh-mime-save-parts-default-directory)
@ -1258,11 +1256,7 @@ See also \\[mh-mh-to-mime]."
(interactive (list (interactive (list
(mml-minibuffer-read-description) (mml-minibuffer-read-description)
(mh-prompt-for-folder "Message from" mh-sent-from-folder nil) (mh-prompt-for-folder "Message from" mh-sent-from-folder nil)
(read-string (concat "Messages" (read-string (format-prompt "Messages" mh-sent-from-msg))))
(if (numberp mh-sent-from-msg)
(format " (default %d): "
mh-sent-from-msg)
": ")))))
(beginning-of-line) (beginning-of-line)
(insert "#forw [") (insert "#forw [")
(and description (and description
@ -1596,7 +1590,7 @@ the possible security methods (see `mh-mml-method-default')."
(if current-prefix-arg (if current-prefix-arg
(let ((def (or (car mh-mml-cryptographic-method-history) (let ((def (or (car mh-mml-cryptographic-method-history)
mh-mml-method-default))) mh-mml-method-default)))
(completing-read (format "Method (default %s): " def) (completing-read (format-prompt "Method" def)
'(("pgp") ("pgpmime") ("smime")) '(("pgp") ("pgpmime") ("smime"))
nil t nil 'mh-mml-cryptographic-method-history def)) nil t nil 'mh-mml-cryptographic-method-history def))
mh-mml-method-default)) mh-mml-method-default))
@ -1731,7 +1725,7 @@ Optional argument DEFAULT is returned if a type isn't entered."
(type (or (and (not (equal probed-type "application/octet-stream")) (type (or (and (not (equal probed-type "application/octet-stream"))
probed-type) probed-type)
(completing-read (completing-read
(format "Content type (default %s): " default) (format-prompt "Content type" default)
(mapcar #'list (mailcap-mime-types)))))) (mapcar #'list (mailcap-mime-types))))))
(if (not (equal type "")) (if (not (equal type ""))
type type

16
lisp/mh-e/mh-seq.el
View file

@ -390,10 +390,7 @@ Prompt with PROMPT, raise an error if the sequence is empty and
the NOT-EMPTY flag is non-nil, and supply an optional DEFAULT the NOT-EMPTY flag is non-nil, and supply an optional DEFAULT
sequence. A reply of `%' defaults to the first sequence sequence. A reply of `%' defaults to the first sequence
containing the current message." containing the current message."
(let* ((input (completing-read (format "%s sequence%s: " prompt (let* ((input (completing-read (format-prompt "%s sequence" default prompt)
(if default
(format " (default %s)" default)
""))
(mh-seq-names mh-seq-list) (mh-seq-names mh-seq-list)
nil nil nil 'mh-sequence-history)) nil nil nil 'mh-sequence-history))
(seq (cond ((equal input "%") (seq (cond ((equal input "%")
@ -646,13 +643,10 @@ should be replaced with:
((stringp default) default) ((stringp default) default)
((symbolp default) (symbol-name default)))) ((symbolp default) (symbol-name default))))
(prompt (cond ((and guess large default) (prompt (cond ((and guess large default)
(format "%s (folder has %s messages, default %s)" (format-prompt "%s (folder has %s messages)"
prompt (car counts) default)) default prompt (car counts)))
((and guess large)
(format "%s (folder has %s messages)"
prompt (car counts)))
(default (default
(format "%s (default %s)" prompt default)))) (format-prompt prompt default))))
(minibuffer-local-completion-map mh-range-completion-map) (minibuffer-local-completion-map mh-range-completion-map)
(seq-list (if (eq folder mh-current-folder) (seq-list (if (eq folder mh-current-folder)
mh-seq-list mh-seq-list
@ -662,7 +656,7 @@ should be replaced with:
(mh-seq-names seq-list))) (mh-seq-names seq-list)))
(input (cond ((and (not ask-flag) unseen) (symbol-name mh-unseen-seq)) (input (cond ((and (not ask-flag) unseen) (symbol-name mh-unseen-seq))
((and (not ask-flag) (not large)) "all") ((and (not ask-flag) (not large)) "all")
(t (completing-read (format "%s: " prompt) (t (completing-read prompt
'mh-range-completion-function nil nil 'mh-range-completion-function nil nil
nil 'mh-range-history default)))) nil 'mh-range-history default))))
msg-list) msg-list)

7
lisp/mh-e/mh-utils.el
View file

@ -757,10 +757,9 @@ function will accept the folder +, which means all folders when
used in searching." used in searching."
(if (null default) (if (null default)
(setq default "")) (setq default ""))
(let* ((default-string (cond (default-string (format " (default %s)" default-string)) (let* ((default-string (or default-string
((equal "" default) "") (if (equal default "") nil default)))
(t (format " (default %s)" default)))) (prompt (format-prompt "%s folder" default-string prompt))
(prompt (format "%s folder%s: " prompt default-string))
(mh-current-folder-name mh-current-folder) (mh-current-folder-name mh-current-folder)
read-name folder-name) read-name folder-name)
(while (and (setq read-name (mh-folder-completing-read (while (and (setq read-name (mh-folder-completing-read

5
lisp/minibuffer.el
View file

@ -3941,13 +3941,14 @@ it. See `format' for details.
If DEFAULT is a list, the first element is used as the default. If DEFAULT is a list, the first element is used as the default.
If not, the element is used as is. If not, the element is used as is.
If DEFAULT is nil, no \"default value\" string is included in the If DEFAULT is nil or an empty string, no \"default value\" string
return value." is included in the return value."
(concat (concat
(if (null format-args) (if (null format-args)
prompt prompt
(apply #'format prompt format-args)) (apply #'format prompt format-args))
(and default (and default
(length> default 0)
(format minibuffer-default-prompt-format (format minibuffer-default-prompt-format
(if (consp default) (if (consp default)
(car default) (car default)

16
lisp/progmodes/etags.el
View file

@ -836,11 +836,7 @@ If no tags table is loaded, do nothing and return nil."
"Read a tag name, with defaulting and completion." "Read a tag name, with defaulting and completion."
(let* ((completion-ignore-case (find-tag--completion-ignore-case)) (let* ((completion-ignore-case (find-tag--completion-ignore-case))
(default (find-tag--default)) (default (find-tag--default))
(spec (completing-read (if default (spec (completing-read (format-prompt string default)
(format "%s (default %s): "
(substring string 0 (string-match "[ :]+\\'" string))
default)
string)
(tags-lazy-completion-table) (tags-lazy-completion-table)
nil nil nil nil default))) nil nil nil nil default)))
(if (equal spec "") (if (equal spec "")
@ -899,7 +895,7 @@ onto a ring and may be popped back to with \\[pop-tag-mark].
Contrast this with the ring of marks gone to by the command. Contrast this with the ring of marks gone to by the command.
See documentation of variable `tags-file-name'." See documentation of variable `tags-file-name'."
(interactive (find-tag-interactive "Find tag: ")) (interactive (find-tag-interactive "Find tag"))
(setq find-tag-history (cons tagname find-tag-history)) (setq find-tag-history (cons tagname find-tag-history))
;; Save the current buffer's value of `find-tag-hook' before ;; Save the current buffer's value of `find-tag-hook' before
@ -971,7 +967,7 @@ Contrast this with the ring of marks gone to by the command.
See documentation of variable `tags-file-name'." See documentation of variable `tags-file-name'."
(declare (obsolete xref-find-definitions "25.1")) (declare (obsolete xref-find-definitions "25.1"))
(interactive (find-tag-interactive "Find tag: ")) (interactive (find-tag-interactive "Find tag"))
(let* ((buf (find-tag-noselect tagname next-p regexp-p)) (let* ((buf (find-tag-noselect tagname next-p regexp-p))
(pos (with-current-buffer buf (point)))) (pos (with-current-buffer buf (point))))
(condition-case nil (condition-case nil
@ -1000,7 +996,7 @@ Contrast this with the ring of marks gone to by the command.
See documentation of variable `tags-file-name'." See documentation of variable `tags-file-name'."
(declare (obsolete xref-find-definitions-other-window "25.1")) (declare (obsolete xref-find-definitions-other-window "25.1"))
(interactive (find-tag-interactive "Find tag other window: ")) (interactive (find-tag-interactive "Find tag other window"))
;; This hair is to deal with the case where the tag is found in the ;; This hair is to deal with the case where the tag is found in the
;; selected window's buffer; without the hair, point is moved in both ;; selected window's buffer; without the hair, point is moved in both
@ -1041,7 +1037,7 @@ Contrast this with the ring of marks gone to by the command.
See documentation of variable `tags-file-name'." See documentation of variable `tags-file-name'."
(declare (obsolete xref-find-definitions-other-frame "25.1")) (declare (obsolete xref-find-definitions-other-frame "25.1"))
(interactive (find-tag-interactive "Find tag other frame: ")) (interactive (find-tag-interactive "Find tag other frame"))
(let ((pop-up-frames t)) (let ((pop-up-frames t))
(with-suppressed-warnings ((obsolete find-tag-other-window)) (with-suppressed-warnings ((obsolete find-tag-other-window))
(find-tag-other-window tagname next-p)))) (find-tag-other-window tagname next-p))))
@ -1065,7 +1061,7 @@ Contrast this with the ring of marks gone to by the command.
See documentation of variable `tags-file-name'." See documentation of variable `tags-file-name'."
(declare (obsolete xref-find-apropos "25.1")) (declare (obsolete xref-find-apropos "25.1"))
(interactive (find-tag-interactive "Find tag regexp: " t)) (interactive (find-tag-interactive "Find tag regexp" t))
;; We go through find-tag-other-window to do all the display hair there. ;; We go through find-tag-other-window to do all the display hair there.
(funcall (if other-window 'find-tag-other-window 'find-tag) (funcall (if other-window 'find-tag-other-window 'find-tag)
regexp next-p t)) regexp next-p t))

2
lisp/progmodes/idlwave.el
View file

@ -7820,7 +7820,7 @@ force class query for object methods."
(name (idlwave-completing-read (name (idlwave-completing-read
(if (or (not this-buffer) (if (or (not this-buffer)
(assoc default list)) (assoc default list))
(format "Module (Default %s): " default) (format-prompt "Module" default)
(format "Module in this file: ")) (format "Module in this file: "))
list)) list))
type class) type class)

4
lisp/progmodes/inf-lisp.el
View file

@ -487,7 +487,7 @@ Used by these commands to determine defaults."
(defun lisp-load-file (file-name) (defun lisp-load-file (file-name)
"Load a Lisp file into the inferior Lisp process." "Load a Lisp file into the inferior Lisp process."
(interactive (comint-get-source "Load Lisp file: " lisp-prev-l/c-dir/file (interactive (comint-get-source "Load Lisp file" lisp-prev-l/c-dir/file
lisp-source-modes nil)) ; nil because LOAD lisp-source-modes nil)) ; nil because LOAD
; doesn't need an exact name ; doesn't need an exact name
(comint-check-source file-name) ; Check to see if buffer needs saved. (comint-check-source file-name) ; Check to see if buffer needs saved.
@ -500,7 +500,7 @@ Used by these commands to determine defaults."
(defun lisp-compile-file (file-name) (defun lisp-compile-file (file-name)
"Compile a Lisp file in the inferior Lisp process." "Compile a Lisp file in the inferior Lisp process."
(interactive (comint-get-source "Compile Lisp file: " lisp-prev-l/c-dir/file (interactive (comint-get-source "Compile Lisp file" lisp-prev-l/c-dir/file
lisp-source-modes nil)) ; nil = don't need lisp-source-modes nil)) ; nil = don't need
; suffix .lisp ; suffix .lisp
(comint-check-source file-name) ; Check to see if buffer needs saved. (comint-check-source file-name) ; Check to see if buffer needs saved.

4
lisp/progmodes/tcl.el
View file

@ -1413,7 +1413,7 @@ Prefix argument means switch to the Tcl buffer afterwards."
(list (list
;; car because comint-get-source returns a list holding the ;; car because comint-get-source returns a list holding the
;; filename. ;; filename.
(car (comint-get-source "Load Tcl file: " (car (comint-get-source "Load Tcl file"
(or (and (or (and
(derived-mode-p 'tcl-mode) (derived-mode-p 'tcl-mode)
(buffer-file-name)) (buffer-file-name))
@ -1433,7 +1433,7 @@ If an inferior Tcl process exists, it is killed first.
Prefix argument means switch to the Tcl buffer afterwards." Prefix argument means switch to the Tcl buffer afterwards."
(interactive (interactive
(list (list
(car (comint-get-source "Restart with Tcl file: " (car (comint-get-source "Restart with Tcl file"
(or (and (or (and
(derived-mode-p 'tcl-mode) (derived-mode-p 'tcl-mode)
(buffer-file-name)) (buffer-file-name))

15
lisp/progmodes/xref.el
View file

@ -1192,12 +1192,7 @@ definitions."
(xref--prompt-p this-command)) (xref--prompt-p this-command))
(let ((id (let ((id
(completing-read (completing-read
(if def (format-prompt prompt def)
(format "%s (default %s): "
(substring prompt 0 (string-match
"[ :]+\\'" prompt))
def)
prompt)
(xref-backend-identifier-completion-table backend) (xref-backend-identifier-completion-table backend)
nil nil nil nil nil nil
'xref--read-identifier-history def))) 'xref--read-identifier-history def)))
@ -1257,19 +1252,19 @@ If sufficient information is available to determine a unique
definition for IDENTIFIER, display it in the selected window. definition for IDENTIFIER, display it in the selected window.
Otherwise, display the list of the possible definitions in a Otherwise, display the list of the possible definitions in a
buffer where the user can select from the list." buffer where the user can select from the list."
(interactive (list (xref--read-identifier "Find definitions of: "))) (interactive (list (xref--read-identifier "Find definitions of")))
(xref--find-definitions identifier nil)) (xref--find-definitions identifier nil))
;;;###autoload ;;;###autoload
(defun xref-find-definitions-other-window (identifier) (defun xref-find-definitions-other-window (identifier)
"Like `xref-find-definitions' but switch to the other window." "Like `xref-find-definitions' but switch to the other window."
(interactive (list (xref--read-identifier "Find definitions of: "))) (interactive (list (xref--read-identifier "Find definitions of")))
(xref--find-definitions identifier 'window)) (xref--find-definitions identifier 'window))
;;;###autoload ;;;###autoload
(defun xref-find-definitions-other-frame (identifier) (defun xref-find-definitions-other-frame (identifier)
"Like `xref-find-definitions' but switch to the other frame." "Like `xref-find-definitions' but switch to the other frame."
(interactive (list (xref--read-identifier "Find definitions of: "))) (interactive (list (xref--read-identifier "Find definitions of")))
(xref--find-definitions identifier 'frame)) (xref--find-definitions identifier 'frame))
;;;###autoload ;;;###autoload
@ -1280,7 +1275,7 @@ offering the symbol at point as the default.
With prefix argument, or if `xref-prompt-for-identifier' is t, With prefix argument, or if `xref-prompt-for-identifier' is t,
always prompt for the identifier. If `xref-prompt-for-identifier' always prompt for the identifier. If `xref-prompt-for-identifier'
is nil, prompt only if there's no usable symbol at point." is nil, prompt only if there's no usable symbol at point."
(interactive (list (xref--read-identifier "Find references of: "))) (interactive (list (xref--read-identifier "Find references of")))
(xref--find-xrefs identifier 'references identifier nil)) (xref--find-xrefs identifier 'references identifier nil))
;;;###autoload ;;;###autoload

12
lisp/ses.el
View file

@ -2653,9 +2653,7 @@ canceled."
(barf-if-buffer-read-only) (barf-if-buffer-read-only)
(if (eq default t) (if (eq default t)
(setq default "") (setq default "")
(setq prompt (format "%s (default %S): " (setq prompt (format-prompt prompt default)))
(substring prompt 0 -2)
default)))
(dolist (key ses-completion-keys) (dolist (key ses-completion-keys)
(define-key ses-mode-edit-map key 'ses-read-printer-complete-symbol)) (define-key ses-mode-edit-map key 'ses-read-printer-complete-symbol))
;; make it globally visible, so that it can be visible from the minibuffer. ;; make it globally visible, so that it can be visible from the minibuffer.
@ -2702,7 +2700,7 @@ right-justified) or a list of one string (will be left-justified)."
;;Range contains differing printer functions ;;Range contains differing printer functions
(setq default t) (setq default t)
(throw 'ses-read-cell-printer t)))))) (throw 'ses-read-cell-printer t))))))
(list (ses-read-printer (format "Cell %S printer: " ses--curcell) (list (ses-read-printer (format "Cell %S printer" ses--curcell)
default)))) default))))
(unless (eq newval t) (unless (eq newval t)
(ses-begin-change) (ses-begin-change)
@ -2716,7 +2714,7 @@ See `ses-read-cell-printer' for input forms."
(interactive (interactive
(let ((col (cdr (ses-sym-rowcol ses--curcell)))) (let ((col (cdr (ses-sym-rowcol ses--curcell))))
(ses-check-curcell) (ses-check-curcell)
(list col (ses-read-printer (format "Column %s printer: " (list col (ses-read-printer (format "Column %s printer"
(ses-column-letter col)) (ses-column-letter col))
(ses-col-printer col))))) (ses-col-printer col)))))
@ -2731,7 +2729,7 @@ See `ses-read-cell-printer' for input forms."
"Set the default printer function for cells that have no other. "Set the default printer function for cells that have no other.
See `ses-read-cell-printer' for input forms." See `ses-read-cell-printer' for input forms."
(interactive (interactive
(list (ses-read-printer "Default printer: " ses--default-printer))) (list (ses-read-printer "Default printer" ses--default-printer)))
(unless (eq newval t) (unless (eq newval t)
(ses-begin-change) (ses-begin-change)
(ses-set-parameter 'ses--default-printer newval) (ses-set-parameter 'ses--default-printer newval)
@ -3773,7 +3771,7 @@ function is redefined."
(setq name (intern name)) (setq name (intern name))
(let* ((cur-printer (gethash name ses--local-printer-hashmap)) (let* ((cur-printer (gethash name ses--local-printer-hashmap))
(default (and cur-printer (ses--locprn-def cur-printer)))) (default (and cur-printer (ses--locprn-def cur-printer))))
(setq def (ses-read-printer (format "Enter definition of printer %S: " name) (setq def (ses-read-printer (format "Enter definition of printer %S" name)
default))) default)))
(list name def))) (list name def)))

4
lisp/subr.el
View file

@ -2806,9 +2806,9 @@ This function is used by the `interactive' code letter `n'."
(when default1 (when default1
(setq prompt (setq prompt
(if (string-match "\\(\\):[ \t]*\\'" prompt) (if (string-match "\\(\\):[ \t]*\\'" prompt)
(replace-match (format " (default %s)" default1) t t prompt 1) (replace-match (format minibuffer-default-prompt-format default1) t t prompt 1)
(replace-regexp-in-string "[ \t]*\\'" (replace-regexp-in-string "[ \t]*\\'"
(format " (default %s) " default1) (format minibuffer-default-prompt-format default1)
prompt t t)))) prompt t t))))
(while (while
(progn (progn

6
lisp/term.el
View file

@ -2535,7 +2535,7 @@ See `term-prompt-regexp'."
;; then the filename reader will only accept a file that exists. ;; then the filename reader will only accept a file that exists.
;; ;;
;; A typical use: ;; A typical use:
;; (interactive (term-get-source "Compile file: " prev-lisp-dir/file ;; (interactive (term-get-source "Compile file" prev-lisp-dir/file
;; '(lisp-mode) t)) ;; '(lisp-mode) t))
;; This is pretty stupid about strings. It decides we're in a string ;; This is pretty stupid about strings. It decides we're in a string
@ -2566,9 +2566,7 @@ See `term-prompt-regexp'."
(car def))) (car def)))
(deffile (if sfile-p (file-name-nondirectory stringfile) (deffile (if sfile-p (file-name-nondirectory stringfile)
(cdr def))) (cdr def)))
(ans (read-file-name (if deffile (format "%s(default %s) " (ans (read-file-name (format-prompt prompt deffile)
prompt deffile)
prompt)
defdir defdir
(concat defdir deffile) (concat defdir deffile)
mustmatch-p))) mustmatch-p)))

4
src/minibuf.c
View file

@ -1490,8 +1490,8 @@ function, instead of the usual behavior. */)
STRING_MULTIBYTE (prompt)); STRING_MULTIBYTE (prompt));
} }
AUTO_STRING (format, "%s (default %s): "); prompt = CALLN (Ffuncall, intern("format-prompt"),
prompt = CALLN (Fformat, format, prompt, prompt,
CONSP (def) ? XCAR (def) : def); CONSP (def) ? XCAR (def) : def);
} }