+2005-09-24 Emilio C. Lopes <eclig@gmx.net>
+
+ * woman.el (woman-file-name):
+ * wid-edit.el (widget-file-prompt-value)
+ (widget-coding-system-prompt-value):
+ * w32-fns.el (set-w32-system-coding-system):
+ * vc.el (vc-version-diff, vc-annotate):
+ * textmodes/reftex-auc.el (reftex-arg-cite)
+ (reftex-arg-index-tag):
+ * textmodes/refer.el (refer-get-bib-files):
+ * textmodes/artist.el (artist-figlet-choose-font):
+ * terminal.el (terminal-emulator):
+ * replace.el (occur-read-primary-args):
+ * rect.el (string-rectangle, string-insert-rectangle):
+ * ps-print.el (ps-print-preprint):
+ * progmodes/pascal.el (pascal-goto-defun):
+ * progmodes/etags.el (visit-tags-table, visit-tags-table-buffer):
+ * progmodes/compile.el (compilation-find-file):
+ * printing.el (pr-interactive-n-up):
+ * play/animate.el (animate-birthday-present):
+ * net/rcompile.el (remote-compile):
+ * man.el (man, Man-goto-section, Man-follow-manual-reference):
+ * mail/rmailsum.el (rmail-summary-search-backward)
+ (rmail-summary-search):
+ * mail/rmailout.el (rmail-output-read-rmail-file-name)
+ (rmail-output-read-file-name):
+ * mail/rmail.el (rmail-search, rmail-search-backwards):
+ * mail/mailabbrev.el (merge-mail-abbrevs, rebuild-mail-abbrevs):
+ * locate.el (locate):
+ * international/quail.el (quail-show-keyboard-layout):
+ * international/mule.el (set-buffer-file-coding-system)
+ (revert-buffer-with-coding-system, set-file-name-coding-system)
+ (set-terminal-coding-system, set-keyboard-coding-system)
+ (set-next-selection-coding-system):
+ * international/mule-diag.el (describe-coding-system)
+ (describe-font, describe-fontset):
+ * international/mule-cmds.el (universal-coding-system-argument)
+ (search-unencodable-char, describe-input-method)
+ (set-language-environment, describe-language-environment):
+ * international/codepage.el (codepage-setup):
+ * international/code-pages.el (codepage-setup):
+ * info.el (Info-search, Info-follow-reference)
+ (Info-search-backward):
+ * emacs-lisp/advice.el (ad-read-advised-function)
+ (ad-read-advice-class, ad-clear-cache, ad-activate)
+ (ad-deactivate, ad-update, ad-unadvise, ad-read-advice-name)
+ (ad-enable-advice, ad-disable-advice, ad-remove-advice)
+ (ad-read-regexp):
+ * ediff-util.el (ediff-toggle-regexp-match):
+ * ediff-ptch.el (ediff-prompt-for-patch-file):
+ * dired-aux.el (dired-diff):
+ * diff.el (diff):
+ * cus-edit.el (custom-variable-prompt):
+ * calendar/timeclock.el (timeclock-ask-for-project):
+ * calc/calcalg3.el (calc-get-fit-variables):
+ * calc/calc-store.el (calc-edit-variable)
+ (calc-permanent-variable):
+ * vc-mcvs.el (vc-mcvs-register):
+ * shadowfile.el (shadow-define-literal-group):
+ * woman.el (woman-file-name):
+ * vc.el (vc-version-diff, vc-merge):
+ * textmodes/reftex-index.el (reftex-index-complete-tag):
+ * format.el (format-decode-buffer, format-decode-region):
+ * emulation/viper-cmd.el (viper-read-string-with-history):
+ * emacs-lisp/debug.el (cancel-debug-on-entry):
+ * emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
+ * ediff.el (ediff-merge-revisions)
+ (ediff-merge-revisions-with-ancestor, ediff-revision):
+ * completion.el (interactive-completion-string-reader):
+ * calc/calc-prog.el (calc-user-define-formula):
+ Follow convention for reading with the minibuffer.
+
2005-09-24 Steven Huwig <steven_h@acm.org> (tiny change)
* progmodes/python.el (python-describe-symbol): Add globals() and
(progn
(setq cmd-base-default (concat "User-" keyname))
(setq cmd (completing-read
- (concat "Define M-x command name (default: calc-"
+ (concat "Define M-x command name (default calc-"
cmd-base-default
"): ")
obarray 'commandp nil
(setq func
(concat "calcFunc-"
(completing-read
- (concat "Define algebraic function name (default: "
+ (concat "Define algebraic function name (default "
cmd-base-default "): ")
(mapcar (lambda (x) (substring x 9))
(all-completions "calcFunc-"
(calc-wrapper
(or var (setq var (calc-read-var-name
(if calc-last-edited-variable
- (format "Edit: (default %s) "
+ (format "Edit (default %s): "
(calc-var-name calc-last-edited-variable))
"Edit: "))))
(or var (setq var calc-last-edited-variable))
(defun calc-permanent-variable (&optional var)
(interactive)
(calc-wrapper
- (or var (setq var (calc-read-var-name "Save variable (default=all): ")))
+ (or var (setq var (calc-read-var-name "Save variable (default all): ")))
(let (calc-pv-pos)
(and var (or (and (boundp var) (symbol-value var))
(error "No such variable")))
(setq defv (calc-invent-independent-variables nv)))
(or defc
(setq defc (calc-invent-parameter-variables nc defv)))
- (let ((vars (read-string (format "Fitting variables: (default %s; %s) "
+ (let ((vars (read-string (format "Fitting variables (default %s; %s): "
(mapconcat 'symbol-name
(mapcar (function (lambda (v)
(nth 1 v)))
(defun timeclock-ask-for-project ()
"Ask the user for the project they are clocking into."
(timeclock-completing-read
- (format "Clock into which project (default \"%s\"): "
+ (format "Clock into which project (default %s): "
(or timeclock-last-project
(car timeclock-project-list)))
(mapcar 'list timeclock-project-list)
(let* ((default (symbol-under-or-before-point))
(new-prompt
(if default
- (format "%s: (default: %s) " prompt default)
+ (format "%s (default %s): " prompt default)
(format "%s: " prompt)))
(read (completing-read new-prompt cmpl-obarray)))
(if (zerop (length read)) (setq read (or default "")))
val)
(setq val (completing-read
(if (and (symbolp v) (custom-variable-p v))
- (format "Customize option: (default %s) " v)
+ (format "Customize option (default %s): " v)
"Customize option: ")
obarray 'custom-variable-p t))
(list (if (equal val "")
(defun customize-group (group)
"Customize GROUP, which must be a customization group."
(interactive (list (let ((completion-ignore-case t))
- (completing-read "Customize group: (default emacs) "
+ (completing-read "Customize group (default emacs): "
obarray
(lambda (symbol)
(or (get symbol 'custom-loads)
(defun customize-group-other-window (group)
"Customize GROUP, which must be a customization group."
(interactive (list (let ((completion-ignore-case t))
- (completing-read "Customize group: (default emacs) "
+ (completing-read "Customize group (default emacs): "
obarray
(lambda (symbol)
(or (get symbol 'custom-loads)
(setq newf (buffer-file-name)
newf (if (and newf (file-exists-p newf))
(read-file-name
- (concat "Diff new file: (default "
- (file-name-nondirectory newf) ") ")
+ (concat "Diff new file (default "
+ (file-name-nondirectory newf) "): ")
nil newf t)
(read-file-name "Diff new file: " nil nil t)))
(setq oldf (file-newest-backup newf)
oldf (if (and oldf (file-exists-p oldf))
(read-file-name
- (concat "Diff original file: (default "
- (file-name-nondirectory oldf) ") ")
+ (concat "Diff original file (default "
+ (file-name-nondirectory oldf) "): ")
(file-name-directory oldf) oldf t)
(read-file-name "Diff original file: "
(file-name-directory newf) nil t)))
(save-excursion (goto-char (mark t))
(dired-get-filename t t)))))
(require 'diff)
- (list (read-file-name (format "Diff %s with: %s"
+ (list (read-file-name (format "Diff %s with%s: "
(dired-get-filename t)
(if default
- (concat "(default " default ") ")
+ (concat " (default " default ")")
""))
(if default
(dired-current-directory)
patch-file-name)
(setq patch-file-name
(read-file-name
- (format "Patch is in file:%s "
+ (format "Patch is in file%s: "
(cond ((and buffer-file-name
(equal (expand-file-name dir)
(file-name-directory buffer-file-name)))
regexp-A
(read-string
(format
- "Ignore A-regions matching this regexp (default \"%s\"): "
+ "Ignore A-regions matching this regexp (default %s): "
ediff-regexp-hide-A))
regexp-B
(read-string
(format
- "Ignore B-regions matching this regexp (default \"%s\"): "
+ "Ignore B-regions matching this regexp (default %s): "
ediff-regexp-hide-B)))
(if ediff-3way-comparison-job
(setq regexp-C
(read-string
(format
- "Ignore C-regions matching this regexp (default \"%s\"): "
+ "Ignore C-regions matching this regexp (default %s): "
ediff-regexp-hide-C))))
(if (eq ediff-hide-regexp-connective 'and)
(setq msg-connective "BOTH"
regexp-A
(read-string
(format
- "Focus on A-regions matching this regexp (default \"%s\"): "
+ "Focus on A-regions matching this regexp (default %s): "
ediff-regexp-focus-A))
regexp-B
(read-string
(format
- "Focus on B-regions matching this regexp (default \"%s\"): "
+ "Focus on B-regions matching this regexp (default %s): "
ediff-regexp-focus-B)))
(if ediff-3way-comparison-job
(setq regexp-C
(read-string
(format
- "Focus on C-regions matching this regexp (default \"%s\"): "
+ "Focus on C-regions matching this regexp (default %s): "
ediff-regexp-focus-C))))
(if (eq ediff-focus-regexp-connective 'and)
(setq msg-connective "BOTH"
(setq rev1
(read-string
(format
- "Version 1 to merge (default: %s's working version): "
+ "Version 1 to merge (default %s's working version): "
(if (stringp file)
(file-name-nondirectory file) "current buffer")))
rev2
(read-string
(format
- "Version 2 to merge (default: %s): "
+ "Version 2 to merge (default %s): "
(if (stringp file)
(file-name-nondirectory file) "current buffer"))))
(ediff-load-version-control)
(setq rev1
(read-string
(format
- "Version 1 to merge (default: %s's working version): "
+ "Version 1 to merge (default %s's working version): "
(if (stringp file)
(file-name-nondirectory file) "current buffer")))
rev2
(read-string
(format
- "Version 2 to merge (default: %s): "
+ "Version 2 to merge (default %s): "
(if (stringp file)
(file-name-nondirectory file) "current buffer")))
ancestor-rev
(read-string
(format
- "Ancestor version (default: %s's base revision): "
+ "Ancestor version (default %s's base revision): "
(if (stringp file)
(file-name-nondirectory file) "current buffer"))))
(ediff-load-version-control)
(let (rev1 rev2)
(setq rev1
(read-string
- (format "Revision 1 to compare (default: %s's latest revision): "
+ (format "Revision 1 to compare (default %s's latest revision): "
(file-name-nondirectory file)))
rev2
(read-string
- (format "Revision 2 to compare (default: %s's current state): "
+ (format "Revision 2 to compare (default %s's current state): "
(file-name-nondirectory file))))
(ediff-load-version-control)
(funcall
(let* ((ad-pReDiCaTe predicate)
(function
(completing-read
- (format "%s(default %s) " (or prompt "Function: ") default)
+ (format "%s (default %s): " (or prompt "Function") default)
ad-advised-functions
(if predicate
(function
(ad-do-return class)))
(error "ad-read-advice-class: `%s' has no advices" function)))
(let ((class (completing-read
- (format "%s(default %s) " (or prompt "Class: ") default)
+ (format "%s (default %s): " (or prompt "Class") default)
ad-advice-class-completion-table nil t)))
(if (equal class "")
default
(error "ad-read-advice-name: `%s' has no %s advice"
function class)
(car (car name-completion-table))))
- (prompt (format "%s(default %s) " (or prompt "Name: ") default))
+ (prompt (format "%s (default %s): " (or prompt "Name") default))
(name (completing-read prompt name-completion-table nil t)))
(if (equal name "")
(intern default)
(defun ad-read-regexp (&optional prompt)
"Read a regular expression from the minibuffer."
(let ((regexp (read-from-minibuffer
- (concat (or prompt "Regular expression: ")
- (if (equal ad-last-regexp "") ""
- (format "(default \"%s\") " ad-last-regexp))))))
+ (concat (or prompt "Regular expression")
+ (if (equal ad-last-regexp "") ": "
+ (format " (default %s): " ad-last-regexp))))))
(setq ad-last-regexp
(if (equal regexp "") ad-last-regexp regexp))))
(defun ad-enable-advice (function class name)
"Enables the advice of FUNCTION with CLASS and NAME."
- (interactive (ad-read-advice-specification "Enable advice of: "))
+ (interactive (ad-read-advice-specification "Enable advice of"))
(if (ad-is-advised function)
(if (eq (ad-enable-advice-internal function class name t) 0)
(error "ad-enable-advice: `%s' has no %s advice matching `%s'"
(defun ad-disable-advice (function class name)
"Disable the advice of FUNCTION with CLASS and NAME."
- (interactive (ad-read-advice-specification "Disable advice of: "))
+ (interactive (ad-read-advice-specification "Disable advice of"))
(if (ad-is-advised function)
(if (eq (ad-enable-advice-internal function class name nil) 0)
(error "ad-disable-advice: `%s' has no %s advice matching `%s'"
"Enables all advices with names that contain a match for REGEXP.
All currently advised functions will be considered."
(interactive
- (list (ad-read-regexp "Enable advices via regexp: ")))
+ (list (ad-read-regexp "Enable advices via regexp")))
(let ((matched-advices (ad-enable-regexp-internal regexp 'any t)))
(if (interactive-p)
(message "%d matching advices enabled" matched-advices))
"Disable all advices with names that contain a match for REGEXP.
All currently advised functions will be considered."
(interactive
- (list (ad-read-regexp "Disable advices via regexp: ")))
+ (list (ad-read-regexp "Disable advices via regexp")))
(let ((matched-advices (ad-enable-regexp-internal regexp 'any nil)))
(if (interactive-p)
(message "%d matching advices disabled" matched-advices))
"Remove FUNCTION's advice with NAME from its advices in CLASS.
If such an advice was found it will be removed from the list of advices
in that CLASS."
- (interactive (ad-read-advice-specification "Remove advice of: "))
+ (interactive (ad-read-advice-specification "Remove advice of"))
(if (ad-is-advised function)
(let* ((advice-to-remove (ad-find-advice function class name)))
(if advice-to-remove
Clear the cache if you want to force `ad-activate' to construct a new
advised definition from scratch."
(interactive
- (list (ad-read-advised-function "Clear cached definition of: ")))
+ (list (ad-read-advised-function "Clear cached definition of")))
(ad-set-advice-info-field function 'cache nil))
(defun ad-make-cache-id (function)
enabled is equivalent to a call to `ad-deactivate'. The current advised
definition will always be cached for later usage."
(interactive
- (list (ad-read-advised-function "Activate advice of: ")
+ (list (ad-read-advised-function "Activate advice of")
current-prefix-arg))
(if ad-activate-on-top-level
;; avoid recursive calls to `ad-activate':
information will still be available so it can be activated again with
a call to `ad-activate'."
(interactive
- (list (ad-read-advised-function "Deactivate advice of: " 'ad-is-active)))
+ (list (ad-read-advised-function "Deactivate advice of" 'ad-is-active)))
(if (not (ad-is-advised function))
(error "ad-deactivate: `%s' is not advised" function)
(cond ((ad-is-active function)
See `ad-activate' for documentation on the optional COMPILE argument."
(interactive
(list (ad-read-advised-function
- "Update advised definition of: " 'ad-is-active)))
+ "Update advised definition of" 'ad-is-active)))
(if (ad-is-active function)
(ad-activate function compile)))
"Deactivate FUNCTION and then remove all its advice information.
If FUNCTION was not advised this will be a noop."
(interactive
- (list (ad-read-advised-function "Unadvise function: ")))
+ (list (ad-read-advised-function "Unadvise function")))
(cond ((ad-is-advised function)
(if (ad-is-active function)
(ad-deactivate function))
that has at least one piece of advice whose name includes a match for REGEXP.
See `ad-activate' for documentation on the optional COMPILE argument."
(interactive
- (list (ad-read-regexp "Activate via advice regexp: ")
+ (list (ad-read-regexp "Activate via advice regexp")
current-prefix-arg))
(ad-do-advised-functions (function)
(if (ad-find-some-advice function 'any regexp)
This deactivates the advice for each function
that has at least one piece of advice whose name includes a match for REGEXP."
(interactive
- (list (ad-read-regexp "Deactivate via advice regexp: ")))
+ (list (ad-read-regexp "Deactivate via advice regexp")))
(ad-do-advised-functions (function)
(if (ad-find-some-advice function 'any regexp)
(ad-deactivate function))))
that has at least one piece of advice whose name includes a match for REGEXP.
See `ad-activate' for documentation on the optional COMPILE argument."
(interactive
- (list (ad-read-regexp "Update via advice regexp: ")
+ (list (ad-read-regexp "Update via advice regexp")
current-prefix-arg))
(ad-do-advised-functions (function)
(if (ad-find-some-advice function 'any regexp)
;; a prefix.
(let ((disambiguate
(completing-read
- "Disambiguating Keyword (default: variable): "
+ "Disambiguating Keyword (default variable): "
'(("function") ("command") ("variable")
("option") ("symbol"))
nil t nil nil "variable")))
(interactive
(list (let ((name
(completing-read
- "Cancel debug on entry to function (default: all functions): "
+ "Cancel debug on entry to function (default all functions): "
(mapcar 'symbol-name debug-function-list) nil t)))
(when name
(unless (string= name "")
each line in the region."
(setq vip-quote-string
(let ((str
- (vip-read-string (format "quote string \(default \"%s\"\): "
+ (vip-read-string (format "quote string (default %s): "
vip-quote-string))))
(if (string= str "") vip-quote-string str)))
(vip-enlarge-region (point) (mark))
(setq keymap (or keymap minibuffer-local-map)
initial (or initial "")
temp-msg (if default
- (format "(default: %s) " default)
+ (format "(default %s) " default)
""))
(setq viper-incomplete-ex-cmd nil)
`buffer-file-format' is set to the format used, and any mode-functions
for the format are called."
(interactive
- (list (format-read "Translate buffer from format (default: guess): ")))
+ (list (format-read "Translate buffer from format (default guess): ")))
(save-excursion
(goto-char (point-min))
(format-decode format (buffer-size) t)))
for identifying regular expressions at the beginning of the region."
(interactive
(list (region-beginning) (region-end)
- (format-read "Translate region from format (default: guess): ")))
+ (format-read "Translate region from format (default guess): ")))
(save-excursion
(goto-char from)
(format-decode format (- to from) nil)))
If DIRECTION is `backward', search in the reverse direction."
(interactive (list (read-string
(if Info-search-history
- (format "Regexp search%s (default `%s'): "
- (if case-fold-search "" " case-sensitively")
+ (format "Regexp search%s (default %s): "
+ (if case-fold-search "" " case-sensitively")
(car Info-search-history))
(format "Regexp search%s: "
- (if case-fold-search "" " case-sensitively")))
+ (if case-fold-search "" " case-sensitively")))
nil 'Info-search-history)))
(when transient-mark-mode
(deactivate-mark))
"Search for REGEXP in the reverse direction."
(interactive (list (read-string
(if Info-search-history
- (format "Regexp search%s backward (default `%s'): "
- (if case-fold-search "" " case-sensitively")
+ (format "Regexp search%s backward (default %s): "
+ (if case-fold-search "" " case-sensitively")
(car Info-search-history))
(format "Regexp search%s backward: "
- (if case-fold-search "" " case-sensitively")))
+ (if case-fold-search "" " case-sensitively")))
nil 'Info-search-history)))
(Info-search regexp bound noerror count 'backward))
(if completions
(let ((input (completing-read (if default
(concat
- "Follow reference named: (default "
- default ") ")
+ "Follow reference named (default "
+ default "): ")
"Follow reference named: ")
completions nil t)))
(list (if (equal input "")
(interactive
(let ((completion-ignore-case t)
(candidates (cp-supported-codepages)))
- (list (completing-read "Setup DOS Codepage: (default 437) " candidates
+ (list (completing-read "Setup DOS Codepage (default 437): " candidates
nil t nil nil "437"))))
(let ((cp (format "cp%s" codepage)))
(unless (coding-system-p (intern cp))
(interactive
(let ((completion-ignore-case t)
(candidates (cp-supported-codepages)))
- (list (completing-read "Setup DOS Codepage: (default 437) " candidates
+ (list (completing-read "Setup DOS Codepage (default 437): " candidates
nil t nil nil "437"))))
(let* ((cp (format "cp%s" codepage))
(cp-defined (intern-soft cp)))
buffer-file-coding-system)))
(list (read-coding-system
(if default
- (format "Coding system for following command (default, %s): " default)
+ (format "Coding system for following command (default %s): " default)
"Coding system for following command: ")
default))))
(let* ((keyseq (read-key-sequence
(interactive
(list (let ((default (or buffer-file-coding-system 'us-ascii)))
(read-coding-system
- (format "Coding-system (default, %s): " default)
+ (format "Coding-system (default %s): " default)
default))))
(let ((pos (unencodable-char-position (point) (point-max) coding-system)))
(if pos
"Describe input method INPUT-METHOD."
(interactive
(list (read-input-method-name
- "Describe input method (default, current choice): ")))
+ "Describe input method (default current choice): ")))
(if (and input-method (symbolp input-method))
(setq input-method (symbol-name input-method)))
(help-setup-xref (list #'describe-input-method
specifies the character set for the major languages of Western Europe."
(interactive (list (read-language-name
nil
- "Set language environment (default, English): ")))
+ "Set language environment (default English): ")))
(if language-name
(if (symbolp language-name)
(setq language-name (symbol-name language-name)))
(interactive
(list (read-language-name
'documentation
- "Describe language environment (default, current choice): ")))
+ "Describe language environment (default current choice): ")))
(if (null language-name)
(setq language-name current-language-environment))
(if (or (null language-name)
(l (copy-sequence input-method-alist)))
(insert "Input methods")
(when input-method
- (insert " (default, " input-method ")")
+ (insert " (default " input-method ")")
(setq input-method (assoc input-method input-method-alist))
(setq l (cons input-method (delete input-method l))))
(insert ":\n")
;;;###autoload
(defun describe-coding-system (coding-system)
"Display information about CODING-SYSTEM."
- (interactive "zDescribe coding system (default, current choices): ")
+ (interactive "zDescribe coding system (default current choices): ")
(if (null coding-system)
(describe-current-coding-system)
(help-setup-xref (list #'describe-coding-system coding-system)
;;;###autoload
(defun describe-font (fontname)
"Display information about fonts which partially match FONTNAME."
- (interactive "sFontname (default, current choice for ASCII chars): ")
+ (interactive "sFontname (default current choice for ASCII chars): ")
(or (and window-system (fboundp 'fontset-list))
(error "No fontsets being used"))
(when (or (not fontname) (= (length fontname) 0))
(mapcar 'cdr fontset-alias-alist)))
(completion-ignore-case t))
(list (completing-read
- "Fontset (default, used by the current frame): "
+ "Fontset (default used by the current frame): "
fontset-list nil t)))))
(if (= (length fontset) 0)
(setq fontset (frame-parameter nil 'font)))
don't want to mark the buffer modified, specify t for NOMODIFY.
If you know exactly what coding system you want to use,
just set the variable `buffer-file-coding-system' directly."
- (interactive "zCoding system for saving file (default, nil): \nP")
+ (interactive "zCoding system for saving file (default nil): \nP")
(check-coding-system coding-system)
(if (and coding-system buffer-file-coding-system (null force))
(setq coding-system
buffer's previous `buffer-file-coding-system' value (if it is
specified there). Otherwise, determine it from the file contents as
usual for visiting a file."
- (interactive "zCoding system for visited file (default, nil): \nP")
+ (interactive "zCoding system for visited file (default nil): \nP")
(check-coding-system coding-system)
(if (and coding-system buffer-file-coding-system (null force))
(setq coding-system
"Set coding system for decoding and encoding file names to CODING-SYSTEM.
It actually just set the variable `file-name-coding-system' (which
see) to CODING-SYSTEM."
- (interactive "zCoding system for file names (default, nil): ")
+ (interactive "zCoding system for file names (default nil): ")
(check-coding-system coding-system)
(if (and coding-system
(coding-system-get coding-system 'ascii-incompatible))
default-terminal-coding-system)
default-terminal-coding-system)))
(read-coding-system
- (format "Coding system for terminal display (default, %s): "
+ (format "Coding system for terminal display (default %s): "
default)
default))))
(if (and (not coding-system)
default-keyboard-coding-system)
default-keyboard-coding-system)))
(read-coding-system
- (format "Coding system for keyboard input (default, %s): "
+ (format "Coding system for keyboard input (default %s): "
default)
default))))
(if (and (not coding-system)
(interactive
(list (read-coding-system
(if last-next-selection-coding-system
- (format "Coding system for the next X selection (default, %S): "
+ (format "Coding system for the next X selection (default %S): "
last-next-selection-coding-system)
"Coding system for the next X selection: ")
last-next-selection-coding-system)))
The variable `quail-keyboard-layout-type' holds the currently selected
keyboard type."
(interactive
- (list (completing-read "Keyboard type (default, current choice): "
+ (list (completing-read "Keyboard type (default current choice): "
quail-keyboard-layout-alist
nil t)))
(or (and keyboard-type (> (length keyboard-type) 0))
(input
(read-from-minibuffer
(if (> (length default) 0)
- (format "Locate (default `%s'): " default)
+ (format "Locate (default %s): " default)
(format "Locate: "))
nil nil nil 'locate-history-list default t)))
(and (equal input "") default
(default-directory (expand-file-name "~/"))
(def mail-personal-alias-file))
(read-file-name
- (format "Read additional aliases from file: (default %s) "
+ (format "Read additional aliases from file (default %s): "
def)
default-directory
(expand-file-name def default-directory)
(default-directory (expand-file-name "~/"))
(def mail-personal-alias-file))
(read-file-name
- (format "Read mail aliases from file: (default %s) " def)
+ (format "Read mail aliases from file (default %s): " def)
default-directory
(expand-file-name def default-directory)
t))))
(interactive
(let* ((reversep (< (prefix-numeric-value current-prefix-arg) 0))
(prompt
- (concat (if reversep "Reverse " "") "Rmail search (regexp): "))
+ (concat (if reversep "Reverse " "") "Rmail search (regexp"))
regexp)
- (if rmail-search-last-regexp
- (setq prompt (concat prompt
- "(default "
- rmail-search-last-regexp
- ") ")))
+ (setq prompt
+ (concat prompt
+ (if rmail-search-last-regexp
+ (concat ", default "
+ rmail-search-last-regexp "): ")
+ "): ")))
(setq regexp (read-string prompt))
(cond ((not (equal regexp ""))
(setq rmail-search-last-regexp regexp))
(interactive
(let* ((reversep (>= (prefix-numeric-value current-prefix-arg) 0))
(prompt
- (concat (if reversep "Reverse " "") "Rmail search (regexp): "))
+ (concat (if reversep "Reverse " "") "Rmail search (regexp"))
regexp)
- (if rmail-search-last-regexp
- (setq prompt (concat prompt
- "(default "
- rmail-search-last-regexp
- ") ")))
+ (setq prompt
+ (concat prompt
+ (if rmail-search-last-regexp
+ (concat ", default "
+ rmail-search-last-regexp "): ")
+ "): ")))
(setq regexp (read-string prompt))
(cond ((not (equal regexp ""))
(setq rmail-search-last-regexp regexp))
(let ((read-file
(expand-file-name
(read-file-name
- (concat "Output message to Rmail file: (default "
+ (concat "Output message to Rmail file (default "
(file-name-nondirectory default-file)
- ") ")
+ "): ")
(file-name-directory default-file)
(abbreviate-file-name default-file))
(file-name-directory default-file))))
(let ((read-file
(expand-file-name
(read-file-name
- (concat "Output message to Unix mail file: (default "
+ (concat "Output message to Unix mail file (default "
(file-name-nondirectory default-file)
- ") ")
+ "): ")
(file-name-directory default-file)
(abbreviate-file-name default-file))
(file-name-directory default-file))))
(interactive
(let* ((reversep (>= (prefix-numeric-value current-prefix-arg) 0))
(prompt
- (concat (if reversep "Reverse " "") "Rmail search (regexp): "))
+ (concat (if reversep "Reverse " "") "Rmail search (regexp"))
regexp)
- (if rmail-search-last-regexp
- (setq prompt (concat prompt
- "(default "
- rmail-search-last-regexp
- ") ")))
+ (setq prompt
+ (concat prompt
+ (if rmail-search-last-regexp
+ (concat ", default "
+ rmail-search-last-regexp "): ")
+ "): ")))
(setq regexp (read-string prompt))
(cond ((not (equal regexp ""))
(setq rmail-search-last-regexp regexp))
(interactive
(let* ((reversep (< (prefix-numeric-value current-prefix-arg) 0))
(prompt
- (concat (if reversep "Reverse " "") "Rmail search (regexp): "))
+ (concat (if reversep "Reverse " "") "Rmail search (regexp"))
regexp)
- (if rmail-search-last-regexp
- (setq prompt (concat prompt
- "(default "
- rmail-search-last-regexp
- ") ")))
+ (setq prompt
+ (concat prompt
+ (if rmail-search-last-regexp
+ (concat ", default "
+ rmail-search-last-regexp "): ")
+ "): ")))
(setq regexp (read-string prompt))
(cond ((not (equal regexp ""))
(setq rmail-search-last-regexp regexp))
(interactive
(list (let* ((default-entry (Man-default-man-entry))
(input (read-string
- (format "Manual entry%s: "
+ (format "Manual entry%s"
(if (string= default-entry "")
- ""
- (format " (default %s)" default-entry)))
+ ": "
+ (format " (default %s): " default-entry)))
nil nil default-entry)))
(if (string= input "")
(error "No man args given")
(let* ((default (aheadsym Man-sections-alist))
(completion-ignore-case t)
chosen
- (prompt (concat "Go to section: (default " default ") ")))
+ (prompt (concat "Go to section (default " default "): ")))
(setq chosen (completing-read prompt Man-sections-alist))
(if (or (not chosen)
(string= chosen ""))
Man-refpages-alist))
(aheadsym Man-refpages-alist)))
chosen
- (prompt (concat "Refer to: (default " default ") ")))
+ (prompt (concat "Refer to (default " default "): ")))
(setq chosen (completing-read prompt Man-refpages-alist))
(if (or (not chosen)
(string= chosen ""))
remote-compile-host)
user (if remote-compile-prompt-for-user
(read-from-minibuffer (format
- "Compile by user (default %s)"
+ "Compile by user (default %s): "
(or remote-compile-user
(user-login-name)))
"" nil nil
(defun animate-birthday-present (&optional name)
"Display one's birthday present in a new buffer.
You can specify the one's name by NAME; the default value is \"Sarah\"."
- (interactive (list (read-string "Name (default \"Sarah\"): "
+ (interactive (list (read-string "Name (default Sarah): "
nil nil "Sarah")))
;; Make a suitable buffer to display the birthday present in.
(switch-to-buffer (get-buffer-create (format "*%s*" name)))
(defun pr-interactive-n-up (mess)
(or (stringp mess) (setq mess "*"))
(save-match-data
- (let* ((fmt-prompt "%s[%s] N-up printing: (default 1) ")
+ (let* ((fmt-prompt "%s[%s] N-up printing (default 1): ")
(prompt "")
(str (pr-f-read-string (format fmt-prompt prompt mess) "1" nil "1"))
int)
marker)
(let ((name (expand-file-name
(read-file-name
- (format "Find this %s in: (default %s) "
+ (format "Find this %s in (default %s): "
compilation-error filename)
spec-dir filename t))))
(if (file-directory-p name)
When you find a tag with \\[find-tag], the buffer it finds the tag
in is given a local value of this variable which is the name of the tags
file the tag was in."
- (interactive (list (read-file-name "Visit tags table: (default TAGS) "
+ (interactive (list (read-file-name "Visit tags table (default TAGS): "
default-directory
(expand-file-name "TAGS"
default-directory)
(car list))
;; Finally, prompt the user for a file name.
(expand-file-name
- (read-file-name "Visit tags table: (default TAGS) "
+ (read-file-name "Visit tags table (default TAGS): "
default-directory
"TAGS"
t))))))
default ""))
(label (if (not (string= default ""))
;; Do completion with default
- (completing-read (concat "Label: (default " default ") ")
+ (completing-read (concat "Label (default " default "): ")
'pascal-comp-defun nil t "")
;; There is no default value. Complete without it
(completing-read "Label: "
(let* ((name (concat (file-name-nondirectory (or (buffer-file-name)
(buffer-name)))
".ps"))
- (prompt (format "Save PostScript to file: (default %s) " name))
+ (prompt (format "Save PostScript to file (default %s): " name))
(res (read-file-name prompt default-directory name nil)))
(while (cond ((file-directory-p res)
(ding)
(list
(region-beginning)
(region-end)
- (read-string (format "String rectangle (default `%s'): "
+ (read-string (format "String rectangle (default %s): "
(or (car string-rectangle-history) ""))
nil 'string-rectangle-history
(car string-rectangle-history)))))
(list
(region-beginning)
(region-end)
- (read-string (format "String insert rectangle (default `%s'): "
+ (read-string (format "String insert rectangle (default %s): "
(or (car string-rectangle-history) ""))
nil 'string-rectangle-history
(car string-rectangle-history)))))
(input
(read-from-minibuffer
(if default
- (format "List lines matching regexp (default `%s'): "
+ (format "List lines matching regexp (default %s): "
(query-replace-descr default))
"List lines matching regexp: ")
nil
(sit-for 2))
try-regexp))
; (username (read-no-blanks-input
-; (format "Username [default: %s]: "
+; (format "Username (default %s): "
; (shadow-get-user primary))
; (if old (or (shadow-cluster-username old) "")
; (user-login-name))))
(name (nth 2 hup))
user site group)
(while (setq site (shadow-read-site))
- (setq user (read-string (format "Username [default %s]: "
+ (setq user (read-string (format "Username (default %s): "
(shadow-get-user site)))
name (read-string "Filename: " name))
(setq group (cons (shadow-make-fullname site
(getenv "SHELL")
"/bin/sh"))
(s (read-string
- (format "Run program in emulator: (default %s) "
+ (format "Run program in emulator (default %s): "
default-s))))
(if (equal s "")
(list default-s '())
"Read any extra arguments for figlet."
(interactive)
(let* ((avail-fonts (artist-figlet-get-font-list))
- (font (completing-read (concat "Select font: (default "
+ (font (completing-read (concat "Select font (default "
artist-figlet-default-font
- ") ")
+ "): ")
(mapcar
(lambda (font) (cons font font))
avail-fonts))))
(list (expand-file-name
(if (eq major-mode 'bibtex-mode)
(read-file-name
- (format ".bib file: (default %s) "
+ (format ".bib file (default %s): "
(file-name-nondirectory
(buffer-file-name)))
(file-name-directory (buffer-file-name))
(setq items (list (or (reftex-citation t) ""))))
(t
(setq prompt (concat (if optional "(Optional) " "")
- (if prompt prompt "Add key")
- ": (default none) "))
+ (if prompt prompt "Add key")
+ " (default none): "))
(setq items (multi-prompt "," t prompt (LaTeX-bibitem-list)))))
(apply 'LaTeX-add-bibitems items)
(TeX-argument-insert (mapconcat 'identity items ",") optional)))
This is the name of an index, not the entry."
(let (tag taglist)
(setq prompt (concat (if optional "(Optional) " "")
- (if prompt prompt "Index tag")
- ": (default none) "))
+ (if prompt prompt "Index tag")
+ " (default none): "))
(if (and reftex-support-index (reftex-plug-flag 4))
;; Use RefTeX completion
(progn
;; OPT-ARGS is a list of optional argument indices, as given by
;; `reftex-parse-args'.
(let* ((opt (and (integerp itag) (member itag opt-args)))
- (index-tags (cdr (assq 'index-tags
- (symbol-value reftex-docstruct-symbol))))
- (default (reftex-default-index))
- (prompt (concat "Index tag"
- (if default (format " (default: %s)" default) "")
- (if opt " (optional)" "") ": "))
- (tag (completing-read prompt (mapcar 'list index-tags))))
+ (index-tags (cdr (assq 'index-tags
+ (symbol-value reftex-docstruct-symbol))))
+ (default (reftex-default-index))
+ (prompt (concat "Index tag"
+ (if (or opt default)
+ (format " (%s): "
+ (concat
+ (if opt "optional" "")
+ (if default
+ (concat (if opt ", " "")
+ (format "default %s" default))
+ "")))
+ ": ")))
+ (tag (completing-read prompt (mapcar 'list index-tags))))
(if (and default (equal tag "")) (setq tag default))
(reftex-update-default-index tag)
tag))
;; Make sure the `mcvs add' will not fire up the CVSEDITOR
;; to add a rule for the given file's extension.
(when (and ext (not (assoc ext types)))
- (let ((type (completing-read "Type to use [default]: "
+ (let ((type (completing-read "Type to use (default): "
'("default" "name-only" "keep-old"
"binary" "value-only")
nil t nil nil "default")))
(interactive
(let ((file (expand-file-name
(read-file-name (if buffer-file-name
- "File or dir to diff: (default visited file) "
+ "File or dir to diff (default visited file): "
"File or dir to diff: ")
default-directory buffer-file-name t)))
(rev1-default nil) (rev2-default nil))
;; construct argument list
(list file
(read-string (if rev1-default
- (concat "Older version: (default "
- rev1-default ") ")
+ (concat "Older version (default "
+ rev1-default "): ")
"Older version: ")
nil nil rev1-default)
(read-string (if rev2-default
- (concat "Newer version: (default "
- rev2-default ") ")
- "Newer version (default: current source): ")
+ (concat "Newer version (default "
+ rev2-default "): ")
+ "Newer version (default current source): ")
nil nil rev2-default))))
(if (file-directory-p file)
;; recursive directory diff
(error "Merge aborted"))))
(setq first-version
(read-string (concat "Branch or version to merge from "
- "(default: news on current branch): ")))
+ "(default news on current branch): ")))
(if (string= first-version "")
(if (not (vc-find-backend-function backend 'merge-news))
(error "Sorry, merging news is not implemented for %s" backend)
(bfn buffer-file-name)
(vc-annotate-version
(if prefix (read-string
- (format "Annotate from version: (default %s) " rev)
+ (format "Annotate from version (default %s): " rev)
nil nil rev)
rev)))
(if display-mode
(if prefix
(setq vc-annotate-display-mode
(float (string-to-number
- (read-string "Annotate span days: (default 20) "
+ (read-string "Annotate span days (default 20): "
nil nil "20"))))))
(setq temp-buffer-name (format "*Annotate %s (rev %s)*"
(buffer-name) vc-annotate-version))
(interactive
(list (let ((default locale-coding-system))
(read-coding-system
- (format "Coding system for system calls (default, %s): "
+ (format "Coding system for system calls (default %s): "
default)
default))))
(check-coding-system coding-system)
(abbreviate-file-name
(if unbound
(read-file-name prompt)
- (let ((prompt2 (format "%s (default %s) " prompt value))
+ (let ((prompt2 (format "%s (default %s): " prompt value))
(dir (file-name-directory value))
(file (file-name-nondirectory value))
(must-match (widget-get widget :must-match)))
;;; (file (file-name-nondirectory value))
;;; (menu-tag (widget-apply widget :menu-tag-get))
;;; (must-match (widget-get widget :must-match))
-;;; (answer (read-file-name (concat menu-tag ": (default `" value "') ")
+;;; (answer (read-file-name (concat menu-tag " (default " value "): ")
;;; dir nil must-match file)))
;;; (widget-value-set widget (abbreviate-file-name answer))
;;; (widget-setup)
"Read coding-system from minibuffer."
(if (widget-get widget :base-only)
(intern
- (completing-read (format "%s (default %s) " prompt value)
+ (completing-read (format "%s (default %s): " prompt value)
(mapcar #'list (coding-system-list t)) nil nil nil
coding-system-history))
- (read-coding-system (format "%s (default %s) " prompt value) value)))
+ (read-coding-system (format "%s (default %s): " prompt value) value)))
(defun widget-coding-system-action (widget &optional event)
(let ((answer
word-at-point)))
(completing-read
(if default
- (format "Manual entry [default: %s]: " default)
+ (format "Manual entry (default %s): " default)
"Manual entry: ")
woman-topic-all-completions nil 1
nil
HCoop / bpt / emacs.git / commitdiff