[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Patch: Follow convention for reading with the minibuffer.
|
From: |
Emilio Lopes |
|
Subject: |
Re: Patch: Follow convention for reading with the minibuffer. |
|
Date: |
Sun, 11 Sep 2005 15:52:44 +0200 |
|
User-agent: |
Emacs Gnus |
Here's my second take on this. Someone please check this patch before
actually committing! It's too easy to make an error when doing such
kind of changes.
For lisp/ChangeLog:
2005-09-11 Emilio C. Lopes <address@hidden>
* woman.el (woman-file-name):
* wid-edit.el (widget-at, 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):
* progmodes/antlr-mode.el (antlr-end-of-rule):
* 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.
For lisp/gnus/ChangeLog:
2005-09-10 Emilio C. Lopes <address@hidden>
* smime.el (smime-sign-buffer, smime-decrypt-buffer):
* mm-view.el (mm-view-pkcs7-decrypt):
* gnus-sum.el (gnus-summary-limit-to-extra)
(gnus-summary-respool-article, gnus-read-move-group-name):
* gnus-score.el (gnus-summary-increase-score):
* gnus-util.el (gnus-completing-read-with-default):
* gnus-art.el (gnus-read-save-file-name)
(gnus-summary-save-in-rmail, gnus-summary-save-in-mail)
(gnus-summary-save-in-file, gnus-summary-save-body-in-file):
* message.el (message-check-news-header-syntax): Follow convention
for reading with the minibuffer.
For lisp/mh-e/ChangeLog:
2005-09-10 Emilio C. Lopes <address@hidden>
* mh-mime.el (mh-compose-forward, mh-mhn-compose-forw):
* mh-comp.el (mh-insert-letter):
* mh-utils.el (mh-prompt-for-folder): Follow convention
for reading with the minibuffer.
diff -rN -c old-emacs-darcs.eclig/lisp/calc/calc-prog.el
new-emacs-darcs.eclig/lisp/calc/calc-prog.el
*** old-emacs-darcs.eclig/lisp/calc/calc-prog.el Sun Sep 11 15:38:02 2005
--- new-emacs-darcs.eclig/lisp/calc/calc-prog.el Sat Sep 10 20:24:25 2005
***************
*** 197,203 ****
(progn
(setq cmd-base-default (concat "User-" keyname))
(setq cmd (completing-read
! (concat "Define M-x command name (default: calc-"
cmd-base-default
"): ")
obarray 'commandp nil
--- 197,203 ----
(progn
(setq cmd-base-default (concat "User-" keyname))
(setq cmd (completing-read
! (concat "Define M-x command name (default calc-"
cmd-base-default
"): ")
obarray 'commandp nil
***************
*** 233,239 ****
(setq func
(concat "calcFunc-"
(completing-read
! (concat "Define algebraic function name (default: "
cmd-base-default "): ")
(mapcar (lambda (x) (substring x 9))
(all-completions "calcFunc-"
--- 233,239 ----
(setq func
(concat "calcFunc-"
(completing-read
! (concat "Define algebraic function name (default "
cmd-base-default "): ")
(mapcar (lambda (x) (substring x 9))
(all-completions "calcFunc-"
diff -rN -c old-emacs-darcs.eclig/lisp/calc/calc-store.el
new-emacs-darcs.eclig/lisp/calc/calc-store.el
*** old-emacs-darcs.eclig/lisp/calc/calc-store.el Sun Sep 11 15:38:02 2005
--- new-emacs-darcs.eclig/lisp/calc/calc-store.el Sat Sep 10 23:35:00 2005
***************
*** 430,436 ****
(calc-wrapper
(or var (setq var (calc-read-var-name
(if calc-last-edited-variable
! (format "Edit: (default %s) "
(calc-var-name calc-last-edited-variable))
"Edit: "))))
(or var (setq var calc-last-edited-variable))
--- 430,436 ----
(calc-wrapper
(or var (setq var (calc-read-var-name
(if calc-last-edited-variable
! (format "Edit (default %s): "
(calc-var-name calc-last-edited-variable))
"Edit: "))))
(or var (setq var calc-last-edited-variable))
***************
*** 587,593 ****
(defun calc-permanent-variable (&optional var)
(interactive)
(calc-wrapper
! (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")))
--- 587,593 ----
(defun calc-permanent-variable (&optional var)
(interactive)
(calc-wrapper
! (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")))
diff -rN -c old-emacs-darcs.eclig/lisp/calc/calcalg3.el
new-emacs-darcs.eclig/lisp/calc/calcalg3.el
*** old-emacs-darcs.eclig/lisp/calc/calcalg3.el Sun Sep 11 15:38:02 2005
--- new-emacs-darcs.eclig/lisp/calc/calcalg3.el Sat Sep 10 23:35:00 2005
***************
*** 370,376 ****
(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) "
(mapconcat 'symbol-name
(mapcar (function (lambda (v)
(nth 1 v)))
--- 370,376 ----
(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): "
(mapconcat 'symbol-name
(mapcar (function (lambda (v)
(nth 1 v)))
diff -rN -c old-emacs-darcs.eclig/lisp/calendar/timeclock.el
new-emacs-darcs.eclig/lisp/calendar/timeclock.el
*** old-emacs-darcs.eclig/lisp/calendar/timeclock.el Sun Sep 11 15:38:02 2005
--- new-emacs-darcs.eclig/lisp/calendar/timeclock.el Sat Sep 10 23:35:00 2005
***************
*** 599,605 ****
(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\"): "
(or timeclock-last-project
(car timeclock-project-list)))
(mapcar 'list timeclock-project-list)
--- 599,605 ----
(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): "
(or timeclock-last-project
(car timeclock-project-list)))
(mapcar 'list timeclock-project-list)
diff -rN -c old-emacs-darcs.eclig/lisp/completion.el
new-emacs-darcs.eclig/lisp/completion.el
*** old-emacs-darcs.eclig/lisp/completion.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/completion.el Sat Sep 10 20:00:22 2005
***************
*** 1343,1349 ****
(let* ((default (symbol-under-or-before-point))
(new-prompt
(if 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 "")))
--- 1343,1349 ----
(let* ((default (symbol-under-or-before-point))
(new-prompt
(if 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 "")))
diff -rN -c old-emacs-darcs.eclig/lisp/cus-edit.el
new-emacs-darcs.eclig/lisp/cus-edit.el
*** old-emacs-darcs.eclig/lisp/cus-edit.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/cus-edit.el Sat Sep 10 23:35:00 2005
***************
*** 495,501 ****
val)
(setq val (completing-read
(if (and (symbolp v) (custom-variable-p v))
! (format "Customize option: (default %s) " v)
"Customize option: ")
obarray 'custom-variable-p t))
(list (if (equal val "")
--- 495,501 ----
val)
(setq val (completing-read
(if (and (symbolp v) (custom-variable-p v))
! (format "Customize option (default %s): " v)
"Customize option: ")
obarray 'custom-variable-p t))
(list (if (equal val "")
***************
*** 967,973 ****
(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) "
obarray
(lambda (symbol)
(or (get symbol 'custom-loads)
--- 967,973 ----
(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): "
obarray
(lambda (symbol)
(or (get symbol 'custom-loads)
***************
*** 990,996 ****
(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) "
obarray
(lambda (symbol)
(or (get symbol 'custom-loads)
--- 990,996 ----
(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): "
obarray
(lambda (symbol)
(or (get symbol 'custom-loads)
diff -rN -c old-emacs-darcs.eclig/lisp/diff.el
new-emacs-darcs.eclig/lisp/diff.el
*** old-emacs-darcs.eclig/lisp/diff.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/diff.el Sat Sep 10 23:35:00 2005
***************
*** 83,97 ****
(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) ") ")
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) ") ")
(file-name-directory oldf) oldf t)
(read-file-name "Diff original file: "
(file-name-directory newf) nil t)))
--- 83,97 ----
(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) "): ")
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) "): ")
(file-name-directory oldf) oldf t)
(read-file-name "Diff original file: "
(file-name-directory newf) nil t)))
diff -rN -c old-emacs-darcs.eclig/lisp/dired-aux.el
new-emacs-darcs.eclig/lisp/dired-aux.el
*** old-emacs-darcs.eclig/lisp/dired-aux.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/dired-aux.el Sat Sep 10 21:49:58 2005
***************
*** 59,69 ****
(save-excursion (goto-char (mark t))
(dired-get-filename t t)))))
(require 'diff)
! (list (read-file-name (format "Diff %s with: %s"
! (dired-get-filename t)
! (if default
! (concat "(default " default ") ")
! ""))
(if default
(dired-current-directory)
(dired-dwim-target-directory))
--- 59,69 ----
(save-excursion (goto-char (mark t))
(dired-get-filename t t)))))
(require 'diff)
! (list (read-file-name (format "Diff %s with%s: "
! (dired-get-filename t)
! (if default
! (concat " (default " default ")")
! ""))
(if default
(dired-current-directory)
(dired-dwim-target-directory))
diff -rN -c old-emacs-darcs.eclig/lisp/ediff-ptch.el
new-emacs-darcs.eclig/lisp/ediff-ptch.el
*** old-emacs-darcs.eclig/lisp/ediff-ptch.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/ediff-ptch.el Sat Sep 10 23:35:00 2005
***************
*** 447,453 ****
(coding-system-for-read ediff-coding-system-for-read))
(find-file-noselect
(read-file-name
! (format "Patch is in file:%s "
(cond ((and buffer-file-name
(equal (expand-file-name dir)
(file-name-directory buffer-file-name)))
--- 447,453 ----
(coding-system-for-read ediff-coding-system-for-read))
(find-file-noselect
(read-file-name
! (format "Patch is in file%s: "
(cond ((and buffer-file-name
(equal (expand-file-name dir)
(file-name-directory buffer-file-name)))
diff -rN -c old-emacs-darcs.eclig/lisp/ediff-util.el
new-emacs-darcs.eclig/lisp/ediff-util.el
*** old-emacs-darcs.eclig/lisp/ediff-util.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/ediff-util.el Sat Sep 10 23:35:00 2005
***************
*** 2219,2236 ****
regexp-A
(read-string
(format
! "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\"): "
ediff-regexp-hide-B)))
(if ediff-3way-comparison-job
(setq regexp-C
(read-string
(format
! "Ignore C-regions matching this regexp (default \"%s\"): "
ediff-regexp-hide-C))))
(if (eq ediff-hide-regexp-connective 'and)
(setq msg-connective "BOTH"
--- 2219,2236 ----
regexp-A
(read-string
(format
! "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): "
ediff-regexp-hide-B)))
(if ediff-3way-comparison-job
(setq regexp-C
(read-string
(format
! "Ignore C-regions matching this regexp (default %s): "
ediff-regexp-hide-C))))
(if (eq ediff-hide-regexp-connective 'and)
(setq msg-connective "BOTH"
***************
*** 2258,2275 ****
regexp-A
(read-string
(format
! "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\"): "
ediff-regexp-focus-B)))
(if ediff-3way-comparison-job
(setq regexp-C
(read-string
(format
! "Focus on C-regions matching this regexp (default \"%s\"): "
ediff-regexp-focus-C))))
(if (eq ediff-focus-regexp-connective 'and)
(setq msg-connective "BOTH"
--- 2258,2275 ----
regexp-A
(read-string
(format
! "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): "
ediff-regexp-focus-B)))
(if ediff-3way-comparison-job
(setq regexp-C
(read-string
(format
! "Focus on C-regions matching this regexp (default %s): "
ediff-regexp-focus-C))))
(if (eq ediff-focus-regexp-connective 'and)
(setq msg-connective "BOTH"
diff -rN -c old-emacs-darcs.eclig/lisp/ediff.el
new-emacs-darcs.eclig/lisp/ediff.el
*** old-emacs-darcs.eclig/lisp/ediff.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/ediff.el Sat Sep 10 20:24:24 2005
***************
*** 1261,1273 ****
(setq rev1
(read-string
(format
! "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): "
(if (stringp file)
(file-name-nondirectory file) "current buffer"))))
(ediff-load-version-control)
--- 1261,1273 ----
(setq rev1
(read-string
(format
! "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): "
(if (stringp file)
(file-name-nondirectory file) "current buffer"))))
(ediff-load-version-control)
***************
*** 1293,1311 ****
(setq rev1
(read-string
(format
! "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): "
(if (stringp file)
(file-name-nondirectory file) "current buffer")))
ancestor-rev
(read-string
(format
! "Ancestor version (default: %s's base revision): "
(if (stringp file)
(file-name-nondirectory file) "current buffer"))))
(ediff-load-version-control)
--- 1293,1311 ----
(setq rev1
(read-string
(format
! "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): "
(if (stringp file)
(file-name-nondirectory file) "current buffer")))
ancestor-rev
(read-string
(format
! "Ancestor version (default %s's base revision): "
(if (stringp file)
(file-name-nondirectory file) "current buffer"))))
(ediff-load-version-control)
***************
*** 1411,1421 ****
(let (rev1 rev2)
(setq rev1
(read-string
! (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): "
(file-name-nondirectory file))))
(ediff-load-version-control)
(funcall
--- 1411,1421 ----
(let (rev1 rev2)
(setq rev1
(read-string
! (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): "
(file-name-nondirectory file))))
(ediff-load-version-control)
(funcall
diff -rN -c old-emacs-darcs.eclig/lisp/emacs-lisp/advice.el
new-emacs-darcs.eclig/lisp/emacs-lisp/advice.el
*** old-emacs-darcs.eclig/lisp/emacs-lisp/advice.el Sun Sep 11 15:38:02 2005
--- new-emacs-darcs.eclig/lisp/emacs-lisp/advice.el Sat Sep 10 22:17:14 2005
***************
*** 2218,2224 ****
(let* ((ad-pReDiCaTe predicate)
(function
(completing-read
! (format "%s(default %s) " (or prompt "Function: ") default)
ad-advised-functions
(if predicate
(function
--- 2218,2224 ----
(let* ((ad-pReDiCaTe predicate)
(function
(completing-read
! (format "%s (default %s): " (or prompt "Function") default)
ad-advised-functions
(if predicate
(function
***************
*** 2250,2256 ****
(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)
ad-advice-class-completion-table nil t)))
(if (equal class "")
default
--- 2250,2256 ----
(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)
ad-advice-class-completion-table nil t)))
(if (equal class "")
default
***************
*** 2268,2274 ****
(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))
(name (completing-read prompt name-completion-table nil t)))
(if (equal name "")
(intern default)
--- 2268,2274 ----
(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))
(name (completing-read prompt name-completion-table nil t)))
(if (equal name "")
(intern default)
***************
*** 2289,2297 ****
(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))))))
(setq ad-last-regexp
(if (equal regexp "") ad-last-regexp regexp))))
--- 2289,2297 ----
(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))))))
(setq ad-last-regexp
(if (equal regexp "") ad-last-regexp regexp))))
***************
*** 2352,2358 ****
(defun ad-enable-advice (function class name)
"Enables the advice of FUNCTION with CLASS and NAME."
! (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'"
--- 2352,2358 ----
(defun ad-enable-advice (function class name)
"Enables the advice of FUNCTION with CLASS and NAME."
! (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'"
***************
*** 2361,2367 ****
(defun ad-disable-advice (function class name)
"Disable the advice of FUNCTION with CLASS and NAME."
! (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'"
--- 2361,2367 ----
(defun ad-disable-advice (function class name)
"Disable the advice of FUNCTION with CLASS and NAME."
! (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'"
***************
*** 2385,2391 ****
"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: ")))
(let ((matched-advices (ad-enable-regexp-internal regexp 'any t)))
(if (interactive-p)
(message "%d matching advices enabled" matched-advices))
--- 2385,2391 ----
"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")))
(let ((matched-advices (ad-enable-regexp-internal regexp 'any t)))
(if (interactive-p)
(message "%d matching advices enabled" matched-advices))
***************
*** 2395,2401 ****
"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: ")))
(let ((matched-advices (ad-enable-regexp-internal regexp 'any nil)))
(if (interactive-p)
(message "%d matching advices disabled" matched-advices))
--- 2395,2401 ----
"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")))
(let ((matched-advices (ad-enable-regexp-internal regexp 'any nil)))
(if (interactive-p)
(message "%d matching advices disabled" matched-advices))
***************
*** 2405,2411 ****
"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: "))
(if (ad-is-advised function)
(let* ((advice-to-remove (ad-find-advice function class name)))
(if advice-to-remove
--- 2405,2411 ----
"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"))
(if (ad-is-advised function)
(let* ((advice-to-remove (ad-find-advice function class name)))
(if advice-to-remove
***************
*** 3285,3291 ****
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: ")))
(ad-set-advice-info-field function 'cache nil))
(defun ad-make-cache-id (function)
--- 3285,3291 ----
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")))
(ad-set-advice-info-field function 'cache nil))
(defun ad-make-cache-id (function)
***************
*** 3602,3608 ****
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: ")
current-prefix-arg))
(if ad-activate-on-top-level
;; avoid recursive calls to `ad-activate':
--- 3602,3608 ----
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")
current-prefix-arg))
(if ad-activate-on-top-level
;; avoid recursive calls to `ad-activate':
***************
*** 3632,3638 ****
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)))
(if (not (ad-is-advised function))
(error "ad-deactivate: `%s' is not advised" function)
(cond ((ad-is-active function)
--- 3632,3638 ----
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)))
(if (not (ad-is-advised function))
(error "ad-deactivate: `%s' is not advised" function)
(cond ((ad-is-active function)
***************
*** 3650,3656 ****
See `ad-activate' for documentation on the optional COMPILE argument."
(interactive
(list (ad-read-advised-function
! "Update advised definition of: " 'ad-is-active)))
(if (ad-is-active function)
(ad-activate function compile)))
--- 3650,3656 ----
See `ad-activate' for documentation on the optional COMPILE argument."
(interactive
(list (ad-read-advised-function
! "Update advised definition of" 'ad-is-active)))
(if (ad-is-active function)
(ad-activate function compile)))
***************
*** 3658,3664 ****
"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: ")))
(cond ((ad-is-advised function)
(if (ad-is-active function)
(ad-deactivate function))
--- 3658,3664 ----
"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")))
(cond ((ad-is-advised function)
(if (ad-is-active function)
(ad-deactivate function))
***************
*** 3689,3695 ****
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: ")
current-prefix-arg))
(ad-do-advised-functions (function)
(if (ad-find-some-advice function 'any regexp)
--- 3689,3695 ----
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")
current-prefix-arg))
(ad-do-advised-functions (function)
(if (ad-find-some-advice function 'any regexp)
***************
*** 3700,3706 ****
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: ")))
(ad-do-advised-functions (function)
(if (ad-find-some-advice function 'any regexp)
(ad-deactivate function))))
--- 3700,3706 ----
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")))
(ad-do-advised-functions (function)
(if (ad-find-some-advice function 'any regexp)
(ad-deactivate function))))
***************
*** 3711,3717 ****
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: ")
current-prefix-arg))
(ad-do-advised-functions (function)
(if (ad-find-some-advice function 'any regexp)
--- 3711,3717 ----
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")
current-prefix-arg))
(ad-do-advised-functions (function)
(if (ad-find-some-advice function 'any regexp)
diff -rN -c old-emacs-darcs.eclig/lisp/emacs-lisp/checkdoc.el
new-emacs-darcs.eclig/lisp/emacs-lisp/checkdoc.el
*** old-emacs-darcs.eclig/lisp/emacs-lisp/checkdoc.el Sun Sep 11 15:38:02 2005
--- new-emacs-darcs.eclig/lisp/emacs-lisp/checkdoc.el Sat Sep 10 20:24:22 2005
***************
*** 1585,1591 ****
;; a prefix.
(let ((disambiguate
(completing-read
! "Disambiguating Keyword (default: variable): "
'(("function") ("command") ("variable")
("option") ("symbol"))
nil t nil nil "variable")))
--- 1585,1591 ----
;; a prefix.
(let ((disambiguate
(completing-read
! "Disambiguating Keyword (default variable): "
'(("function") ("command") ("variable")
("option") ("symbol"))
nil t nil nil "variable")))
diff -rN -c old-emacs-darcs.eclig/lisp/emacs-lisp/debug.el
new-emacs-darcs.eclig/lisp/emacs-lisp/debug.el
*** old-emacs-darcs.eclig/lisp/emacs-lisp/debug.el Sun Sep 11 15:38:02 2005
--- new-emacs-darcs.eclig/lisp/emacs-lisp/debug.el Sat Sep 10 20:24:21 2005
***************
*** 754,760 ****
(interactive
(list (let ((name
(completing-read
! "Cancel debug on entry to function (default: all functions): "
(mapcar 'symbol-name debug-function-list) nil t)))
(when name
(unless (string= name "")
--- 754,760 ----
(interactive
(list (let ((name
(completing-read
! "Cancel debug on entry to function (default all functions): "
(mapcar 'symbol-name debug-function-list) nil t)))
(when name
(unless (string= name "")
diff -rN -c old-emacs-darcs.eclig/lisp/emulation/vip.el
new-emacs-darcs.eclig/lisp/emulation/vip.el
*** old-emacs-darcs.eclig/lisp/emulation/vip.el Sun Sep 11 15:38:02 2005
--- new-emacs-darcs.eclig/lisp/emulation/vip.el Sat Sep 10 23:35:00 2005
***************
*** 893,899 ****
each line in the region."
(setq vip-quote-string
(let ((str
! (vip-read-string (format "quote string \(default \"%s\"\): "
vip-quote-string))))
(if (string= str "") vip-quote-string str)))
(vip-enlarge-region (point) (mark))
--- 893,899 ----
each line in the region."
(setq vip-quote-string
(let ((str
! (vip-read-string (format "quote string (default %s): "
vip-quote-string))))
(if (string= str "") vip-quote-string str)))
(vip-enlarge-region (point) (mark))
diff -rN -c old-emacs-darcs.eclig/lisp/emulation/viper-cmd.el
new-emacs-darcs.eclig/lisp/emulation/viper-cmd.el
*** old-emacs-darcs.eclig/lisp/emulation/viper-cmd.el Sun Sep 11 15:38:02 2005
--- new-emacs-darcs.eclig/lisp/emulation/viper-cmd.el Tue Sep 6 19:06:42 2005
***************
*** 2154,2160 ****
(setq keymap (or keymap minibuffer-local-map)
initial (or initial "")
temp-msg (if default
! (format "(default: %s) " default)
""))
(setq viper-incomplete-ex-cmd nil)
--- 2154,2160 ----
(setq keymap (or keymap minibuffer-local-map)
initial (or initial "")
temp-msg (if default
! (format "(default %s) " default)
""))
(setq viper-incomplete-ex-cmd nil)
diff -rN -c old-emacs-darcs.eclig/lisp/format.el
new-emacs-darcs.eclig/lisp/format.el
*** old-emacs-darcs.eclig/lisp/format.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/format.el Sat Sep 10 20:24:20 2005
***************
*** 316,322 ****
`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): ")))
(save-excursion
(goto-char (point-min))
(format-decode format (buffer-size) t)))
--- 316,322 ----
`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): ")))
(save-excursion
(goto-char (point-min))
(format-decode format (buffer-size) t)))
***************
*** 327,333 ****
for identifying regular expressions at the beginning of the region."
(interactive
(list (region-beginning) (region-end)
! (format-read "Translate region from format (default: guess): ")))
(save-excursion
(goto-char from)
(format-decode format (- to from) nil)))
--- 327,333 ----
for identifying regular expressions at the beginning of the region."
(interactive
(list (region-beginning) (region-end)
! (format-read "Translate region from format (default guess): ")))
(save-excursion
(goto-char from)
(format-decode format (- to from) nil)))
diff -rN -c old-emacs-darcs.eclig/lisp/gnus/gnus-art.el
new-emacs-darcs.eclig/lisp/gnus/gnus-art.el
*** old-emacs-darcs.eclig/lisp/gnus/gnus-art.el Sun Sep 11 15:38:02 2005
--- new-emacs-darcs.eclig/lisp/gnus/gnus-art.el Sat Sep 10 23:35:00 2005
***************
*** 3255,3261 ****
((null split-name)
(read-file-name
(concat prompt " (default "
! (file-name-nondirectory default-name) ") ")
(file-name-directory default-name)
default-name))
;; A single group name is returned.
--- 3255,3261 ----
((null split-name)
(read-file-name
(concat prompt " (default "
! (file-name-nondirectory default-name) "): ")
(file-name-directory default-name)
default-name))
;; A single group name is returned.
***************
*** 3265,3271 ****
(symbol-value variable)))
(read-file-name
(concat prompt " (default "
! (file-name-nondirectory default-name) ") ")
(file-name-directory default-name)
default-name))
;; A single split name was found
--- 3265,3271 ----
(symbol-value variable)))
(read-file-name
(concat prompt " (default "
! (file-name-nondirectory default-name) "): ")
(file-name-directory default-name)
default-name))
;; A single split name was found
***************
*** 3278,3284 ****
((file-exists-p name) name)
(t gnus-article-save-directory))))
(read-file-name
! (concat prompt " (default " name ") ")
dir name)))
;; A list of splits was found.
(t
--- 3278,3284 ----
((file-exists-p name) name)
(t gnus-article-save-directory))))
(read-file-name
! (concat prompt " (default " name "): ")
dir name)))
;; A list of splits was found.
(t
***************
*** 3289,3295 ****
(setq result
(expand-file-name
(read-file-name
! (concat prompt " (`M-p' for defaults) ")
gnus-article-save-directory
(car split-name))
gnus-article-save-directory)))
--- 3289,3295 ----
(setq result
(expand-file-name
(read-file-name
! (concat prompt " (`M-p' for defaults): ")
gnus-article-save-directory
(car split-name))
gnus-article-save-directory)))
***************
*** 3323,3329 ****
Optional argument FILENAME specifies file name.
Directory to save to is default to `gnus-article-save-directory'."
(setq filename (gnus-read-save-file-name
! "Save %s in rmail file:" filename
gnus-rmail-save-name gnus-newsgroup-name
gnus-current-headers 'gnus-newsgroup-last-rmail))
(gnus-eval-in-buffer-window gnus-save-article-buffer
--- 3323,3329 ----
Optional argument FILENAME specifies file name.
Directory to save to is default to `gnus-article-save-directory'."
(setq filename (gnus-read-save-file-name
! "Save %s in rmail file" filename
gnus-rmail-save-name gnus-newsgroup-name
gnus-current-headers 'gnus-newsgroup-last-rmail))
(gnus-eval-in-buffer-window gnus-save-article-buffer
***************
*** 3338,3344 ****
Optional argument FILENAME specifies file name.
Directory to save to is default to `gnus-article-save-directory'."
(setq filename (gnus-read-save-file-name
! "Save %s in Unix mail file:" filename
gnus-mail-save-name gnus-newsgroup-name
gnus-current-headers 'gnus-newsgroup-last-mail))
(gnus-eval-in-buffer-window gnus-save-article-buffer
--- 3338,3344 ----
Optional argument FILENAME specifies file name.
Directory to save to is default to `gnus-article-save-directory'."
(setq filename (gnus-read-save-file-name
! "Save %s in Unix mail file" filename
gnus-mail-save-name gnus-newsgroup-name
gnus-current-headers 'gnus-newsgroup-last-mail))
(gnus-eval-in-buffer-window gnus-save-article-buffer
***************
*** 3357,3363 ****
Optional argument FILENAME specifies file name.
Directory to save to is default to `gnus-article-save-directory'."
(setq filename (gnus-read-save-file-name
! "Save %s in file:" filename
gnus-file-save-name gnus-newsgroup-name
gnus-current-headers 'gnus-newsgroup-last-file))
(gnus-eval-in-buffer-window gnus-save-article-buffer
--- 3357,3363 ----
Optional argument FILENAME specifies file name.
Directory to save to is default to `gnus-article-save-directory'."
(setq filename (gnus-read-save-file-name
! "Save %s in file" filename
gnus-file-save-name gnus-newsgroup-name
gnus-current-headers 'gnus-newsgroup-last-file))
(gnus-eval-in-buffer-window gnus-save-article-buffer
***************
*** 3381,3387 ****
Optional argument FILENAME specifies file name.
The directory to save in defaults to `gnus-article-save-directory'."
(setq filename (gnus-read-save-file-name
! "Save %s body in file:" filename
gnus-file-save-name gnus-newsgroup-name
gnus-current-headers 'gnus-newsgroup-last-file))
(gnus-eval-in-buffer-window gnus-save-article-buffer
--- 3381,3387 ----
Optional argument FILENAME specifies file name.
The directory to save in defaults to `gnus-article-save-directory'."
(setq filename (gnus-read-save-file-name
! "Save %s body in file" filename
gnus-file-save-name gnus-newsgroup-name
gnus-current-headers 'gnus-newsgroup-last-file))
(gnus-eval-in-buffer-window gnus-save-article-buffer
diff -rN -c old-emacs-darcs.eclig/lisp/gnus/gnus-score.el
new-emacs-darcs.eclig/lisp/gnus/gnus-score.el
*** old-emacs-darcs.eclig/lisp/gnus/gnus-score.el Sun Sep 11 15:38:02 2005
--- new-emacs-darcs.eclig/lisp/gnus/gnus-score.el Sat Sep 10 23:35:00 2005
***************
*** 652,658 ****
(intern ; need symbol
(gnus-completing-read-with-default
(symbol-name (car gnus-extra-headers)) ; default response
! "Score extra header:" ; prompt
(mapcar (lambda (x) ; completion list
(cons (symbol-name x) x))
gnus-extra-headers)
--- 652,658 ----
(intern ; need symbol
(gnus-completing-read-with-default
(symbol-name (car gnus-extra-headers)) ; default response
! "Score extra header" ; prompt
(mapcar (lambda (x) ; completion list
(cons (symbol-name x) x))
gnus-extra-headers)
diff -rN -c old-emacs-darcs.eclig/lisp/gnus/gnus-sum.el
new-emacs-darcs.eclig/lisp/gnus/gnus-sum.el
*** old-emacs-darcs.eclig/lisp/gnus/gnus-sum.el Sun Sep 11 15:38:02 2005
--- new-emacs-darcs.eclig/lisp/gnus/gnus-sum.el Sat Sep 10 23:35:00 2005
***************
*** 7696,7703 ****
(gnus-completing-read-with-default
(symbol-name (car gnus-extra-headers))
(if current-prefix-arg
! "Exclude extra header:"
! "Limit extra header:")
(mapcar (lambda (x)
(cons (symbol-name x) x))
gnus-extra-headers)
--- 7696,7703 ----
(gnus-completing-read-with-default
(symbol-name (car gnus-extra-headers))
(if current-prefix-arg
! "Exclude extra header"
! "Limit extra header")
(mapcar (lambda (x)
(cons (symbol-name x) x))
gnus-extra-headers)
***************
*** 9218,9224 ****
gnus-newsgroup-name)))))
(method
(gnus-completing-read-with-default
! methname "What backend do you want to use when respooling?"
methods nil t nil 'gnus-mail-method-history))
ms)
(cond
--- 9218,9224 ----
gnus-newsgroup-name)))))
(method
(gnus-completing-read-with-default
! methname "Backend to use when respooling"
methods nil t nil 'gnus-mail-method-history))
ms)
(cond
***************
*** 11043,11049 ****
(let* ((split-name (gnus-get-split-value gnus-move-split-methods))
(minibuffer-confirm-incomplete nil) ; XEmacs
(prom
! (format "%s %s to:"
prompt
(if (> (length articles) 1)
(format "these %d articles" (length articles))
--- 11043,11049 ----
(let* ((split-name (gnus-get-split-value gnus-move-split-methods))
(minibuffer-confirm-incomplete nil) ; XEmacs
(prom
! (format "%s %s to"
prompt
(if (> (length articles) 1)
(format "these %d articles" (length articles))
diff -rN -c old-emacs-darcs.eclig/lisp/gnus/gnus-util.el
new-emacs-darcs.eclig/lisp/gnus/gnus-util.el
*** old-emacs-darcs.eclig/lisp/gnus/gnus-util.el Sun Sep 11 15:38:02 2005
--- new-emacs-darcs.eclig/lisp/gnus/gnus-util.el Sat Sep 10 23:35:00 2005
***************
*** 335,342 ****
(defun gnus-completing-read-with-default (default prompt &rest args)
;; Like `completing-read', except that DEFAULT is the default argument.
(let* ((prompt (if default
! (concat prompt " (default " default ") ")
! (concat prompt " ")))
(answer (apply 'completing-read prompt args)))
(if (or (null answer) (zerop (length answer)))
default
--- 335,342 ----
(defun gnus-completing-read-with-default (default prompt &rest args)
;; Like `completing-read', except that DEFAULT is the default argument.
(let* ((prompt (if default
! (concat prompt " (default " default "): ")
! (concat prompt ": ")))
(answer (apply 'completing-read prompt args)))
(if (or (null answer) (zerop (length answer)))
default
diff -rN -c old-emacs-darcs.eclig/lisp/gnus/message.el
new-emacs-darcs.eclig/lisp/gnus/message.el
*** old-emacs-darcs.eclig/lisp/gnus/message.el Sun Sep 11 15:38:02 2005
--- new-emacs-darcs.eclig/lisp/gnus/message.el Sat Sep 10 20:24:18 2005
***************
*** 4197,4203 ****
(zerop
(length
(setq to (completing-read
! "Followups to (default: no Followup-To header) "
(mapcar #'list
(cons "poster"
(message-tokenize-header
--- 4197,4203 ----
(zerop
(length
(setq to (completing-read
! "Followups to (default no Followup-To header): "
(mapcar #'list
(cons "poster"
(message-tokenize-header
diff -rN -c old-emacs-darcs.eclig/lisp/gnus/mm-view.el
new-emacs-darcs.eclig/lisp/gnus/mm-view.el
*** old-emacs-darcs.eclig/lisp/gnus/mm-view.el Sun Sep 11 15:38:02 2005
--- new-emacs-darcs.eclig/lisp/gnus/mm-view.el Sat Sep 10 22:45:18 2005
***************
*** 576,584 ****
(cadar smime-keys)
(smime-get-key-by-email
(gnus-completing-read-maybe-default
! (concat "Decipher using which key? "
! (if smime-keys (concat "(default " (caar smime-keys) ") ")
! ""))
smime-keys nil nil nil nil (car-safe (car-safe smime-keys))))))
(goto-char (point-min))
(while (search-forward "\r\n" nil t)
--- 576,585 ----
(cadar smime-keys)
(smime-get-key-by-email
(gnus-completing-read-maybe-default
! (concat "Decipher using key"
! (if smime-keys
! (concat " (default " (caar smime-keys) "): ")
! ": "))
smime-keys nil nil nil nil (car-safe (car-safe smime-keys))))))
(goto-char (point-min))
(while (search-forward "\r\n" nil t)
diff -rN -c old-emacs-darcs.eclig/lisp/gnus/smime.el
new-emacs-darcs.eclig/lisp/gnus/smime.el
*** old-emacs-darcs.eclig/lisp/gnus/smime.el Sun Sep 11 15:38:02 2005
--- new-emacs-darcs.eclig/lisp/gnus/smime.el Sat Sep 10 23:35:00 2005
***************
*** 341,349 ****
keyfile
(smime-get-key-with-certs-by-email
(completing-read
! (concat "Sign using which key? "
! (if smime-keys (concat "(default " (caar smime-keys)
") ")
! ""))
smime-keys nil nil (car-safe (car-safe smime-keys))))))
(error "Signing failed"))))
--- 341,350 ----
keyfile
(smime-get-key-with-certs-by-email
(completing-read
! (concat "Sign using key"
! (if smime-keys
! (concat " (default " (caar smime-keys) "): ")
! ": "))
smime-keys nil nil (car-safe (car-safe smime-keys))))))
(error "Signing failed"))))
***************
*** 472,480 ****
(or keyfile
(smime-get-key-by-email
(completing-read
! (concat "Decipher using which key? "
! (if smime-keys (concat "(default " (caar smime-keys) ") ")
! ""))
smime-keys nil nil (car-safe (car-safe smime-keys)))))))))
;; Various operations
--- 473,481 ----
(or keyfile
(smime-get-key-by-email
(completing-read
! (concat "Decipher using key"
! (if smime-keys (concat " (default " (caar smime-keys) "): ")
! ": "))
smime-keys nil nil (car-safe (car-safe smime-keys)))))))))
;; Various operations
diff -rN -c old-emacs-darcs.eclig/lisp/info.el
new-emacs-darcs.eclig/lisp/info.el
*** old-emacs-darcs.eclig/lisp/info.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/info.el Sat Sep 10 23:35:00 2005
***************
*** 1569,1575 ****
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")
(car Info-search-history))
(format "Regexp search%s: "
--- 1569,1575 ----
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")
(car Info-search-history))
(format "Regexp search%s: "
***************
*** 1757,1763 ****
"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")
(car Info-search-history))
(format "Regexp search%s backward: "
--- 1757,1763 ----
"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")
(car Info-search-history))
(format "Regexp search%s backward: "
***************
*** 2107,2114 ****
(if completions
(let ((input (completing-read (if default
(concat
! "Follow reference named: (default "
! default ") ")
"Follow reference named: ")
completions nil t)))
(list (if (equal input "")
--- 2107,2114 ----
(if completions
(let ((input (completing-read (if default
(concat
! "Follow reference named (default "
! default "): ")
"Follow reference named: ")
completions nil t)))
(list (if (equal input "")
diff -rN -c old-emacs-darcs.eclig/lisp/international/code-pages.el
new-emacs-darcs.eclig/lisp/international/code-pages.el
*** old-emacs-darcs.eclig/lisp/international/code-pages.el Sun Sep 11
15:38:03 2005
--- new-emacs-darcs.eclig/lisp/international/code-pages.el Sat Sep 10
23:35:00 2005
***************
*** 130,136 ****
(interactive
(let ((completion-ignore-case t)
(candidates (cp-supported-codepages)))
! (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))
--- 130,136 ----
(interactive
(let ((completion-ignore-case t)
(candidates (cp-supported-codepages)))
! (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))
diff -rN -c old-emacs-darcs.eclig/lisp/international/codepage.el
new-emacs-darcs.eclig/lisp/international/codepage.el
*** old-emacs-darcs.eclig/lisp/international/codepage.el Sun Sep 11
15:38:03 2005
--- new-emacs-darcs.eclig/lisp/international/codepage.el Sat Sep 10
23:35:00 2005
***************
*** 660,666 ****
(interactive
(let ((completion-ignore-case t)
(candidates (cp-supported-codepages)))
! (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)))
--- 660,666 ----
(interactive
(let ((completion-ignore-case t)
(candidates (cp-supported-codepages)))
! (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)))
diff -rN -c old-emacs-darcs.eclig/lisp/international/mule-cmds.el
new-emacs-darcs.eclig/lisp/international/mule-cmds.el
*** old-emacs-darcs.eclig/lisp/international/mule-cmds.el Sun Sep 11
15:38:03 2005
--- new-emacs-darcs.eclig/lisp/international/mule-cmds.el Sun Sep 11
15:31:56 2005
***************
*** 278,284 ****
buffer-file-coding-system)))
(list (read-coding-system
(if default
! (format "Coding system for following command (default, %s): "
default)
"Coding system for following command: ")
default))))
(let* ((keyseq (read-key-sequence
--- 278,284 ----
buffer-file-coding-system)))
(list (read-coding-system
(if default
! (format "Coding system for following command (default %s): "
default)
"Coding system for following command: ")
default))))
(let* ((keyseq (read-key-sequence
***************
*** 616,622 ****
(interactive
(list (let ((default (or buffer-file-coding-system 'us-ascii)))
(read-coding-system
! (format "Coding-system (default, %s): " default)
default))))
(let ((pos (unencodable-char-position (point) (point-max) coding-system)))
(if pos
--- 616,622 ----
(interactive
(list (let ((default (or buffer-file-coding-system 'us-ascii)))
(read-coding-system
! (format "Coding-system (default %s): " default)
default))))
(let ((pos (unencodable-char-position (point) (point-max) coding-system)))
(if pos
***************
*** 1490,1496 ****
"Describe input method INPUT-METHOD."
(interactive
(list (read-input-method-name
! "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
--- 1490,1496 ----
"Describe input method INPUT-METHOD."
(interactive
(list (read-input-method-name
! "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
***************
*** 1810,1816 ****
specifies the character set for the major languages of Western Europe."
(interactive (list (read-language-name
nil
! "Set language environment (default, English): ")))
(if language-name
(if (symbolp language-name)
(setq language-name (symbol-name language-name)))
--- 1810,1816 ----
specifies the character set for the major languages of Western Europe."
(interactive (list (read-language-name
nil
! "Set language environment (default English): ")))
(if language-name
(if (symbolp language-name)
(setq language-name (symbol-name language-name)))
***************
*** 1987,1993 ****
(interactive
(list (read-language-name
'documentation
! "Describe language environment (default, current choice): ")))
(if (null language-name)
(setq language-name current-language-environment))
(if (or (null language-name)
--- 1987,1993 ----
(interactive
(list (read-language-name
'documentation
! "Describe language environment (default current choice): ")))
(if (null language-name)
(setq language-name current-language-environment))
(if (or (null language-name)
***************
*** 2015,2021 ****
(l (copy-sequence input-method-alist)))
(insert "Input methods")
(when 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")
--- 2015,2021 ----
(l (copy-sequence input-method-alist)))
(insert "Input methods")
(when 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")
diff -rN -c old-emacs-darcs.eclig/lisp/international/mule-diag.el
new-emacs-darcs.eclig/lisp/international/mule-diag.el
*** old-emacs-darcs.eclig/lisp/international/mule-diag.el Sun Sep 11
15:38:03 2005
--- new-emacs-darcs.eclig/lisp/international/mule-diag.el Sat Sep 10
23:35:00 2005
***************
*** 598,604 ****
;;;###autoload
(defun describe-coding-system (coding-system)
"Display information about CODING-SYSTEM."
! (interactive "zDescribe coding system (default, current choices): ")
(if (null coding-system)
(describe-current-coding-system)
(help-setup-xref (list #'describe-coding-system coding-system)
--- 598,604 ----
;;;###autoload
(defun describe-coding-system (coding-system)
"Display information about CODING-SYSTEM."
! (interactive "zDescribe coding system (default current choices): ")
(if (null coding-system)
(describe-current-coding-system)
(help-setup-xref (list #'describe-coding-system coding-system)
***************
*** 1040,1046 ****
;;;###autoload
(defun describe-font (fontname)
"Display information about fonts which partially match FONTNAME."
! (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))
--- 1040,1046 ----
;;;###autoload
(defun describe-font (fontname)
"Display information about fonts which partially match FONTNAME."
! (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))
***************
*** 1137,1143 ****
(mapcar 'cdr fontset-alias-alist)))
(completion-ignore-case t))
(list (completing-read
! "Fontset (default, used by the current frame): "
fontset-list nil t)))))
(if (= (length fontset) 0)
(setq fontset (frame-parameter nil 'font)))
--- 1137,1143 ----
(mapcar 'cdr fontset-alias-alist)))
(completion-ignore-case t))
(list (completing-read
! "Fontset (default used by the current frame): "
fontset-list nil t)))))
(if (= (length fontset) 0)
(setq fontset (frame-parameter nil 'font)))
diff -rN -c old-emacs-darcs.eclig/lisp/international/mule.el
new-emacs-darcs.eclig/lisp/international/mule.el
*** old-emacs-darcs.eclig/lisp/international/mule.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/international/mule.el Sat Sep 10 23:35:00 2005
***************
*** 1159,1165 ****
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")
(check-coding-system coding-system)
(if (and coding-system buffer-file-coding-system (null force))
(setq coding-system
--- 1159,1165 ----
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")
(check-coding-system coding-system)
(if (and coding-system buffer-file-coding-system (null force))
(setq coding-system
***************
*** 1183,1189 ****
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")
(check-coding-system coding-system)
(if (and coding-system buffer-file-coding-system (null force))
(setq coding-system
--- 1183,1189 ----
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")
(check-coding-system coding-system)
(if (and coding-system buffer-file-coding-system (null force))
(setq coding-system
***************
*** 1195,1201 ****
"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): ")
(check-coding-system coding-system)
(if (and coding-system
(coding-system-get coding-system 'ascii-incompatible))
--- 1195,1201 ----
"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): ")
(check-coding-system coding-system)
(if (and coding-system
(coding-system-get coding-system 'ascii-incompatible))
***************
*** 1219,1225 ****
default-terminal-coding-system)
default-terminal-coding-system)))
(read-coding-system
! (format "Coding system for terminal display (default, %s): "
default)
default))))
(if (and (not coding-system)
--- 1219,1225 ----
default-terminal-coding-system)
default-terminal-coding-system)))
(read-coding-system
! (format "Coding system for terminal display (default %s): "
default)
default))))
(if (and (not coding-system)
***************
*** 1248,1254 ****
default-keyboard-coding-system)
default-keyboard-coding-system)))
(read-coding-system
! (format "Coding system for keyboard input (default, %s): "
default)
default))))
(if (and (not coding-system)
--- 1248,1254 ----
default-keyboard-coding-system)
default-keyboard-coding-system)))
(read-coding-system
! (format "Coding system for keyboard input (default %s): "
default)
default))))
(if (and (not coding-system)
***************
*** 1321,1327 ****
(interactive
(list (read-coding-system
(if last-next-selection-coding-system
! (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)))
--- 1321,1327 ----
(interactive
(list (read-coding-system
(if last-next-selection-coding-system
! (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)))
diff -rN -c old-emacs-darcs.eclig/lisp/international/quail.el
new-emacs-darcs.eclig/lisp/international/quail.el
*** old-emacs-darcs.eclig/lisp/international/quail.el Sun Sep 11 15:38:02 2005
--- new-emacs-darcs.eclig/lisp/international/quail.el Sat Sep 10 23:35:00 2005
***************
*** 897,903 ****
The variable `quail-keyboard-layout-type' holds the currently selected
keyboard type."
(interactive
! (list (completing-read "Keyboard type (default, current choice): "
quail-keyboard-layout-alist
nil t)))
(or (and keyboard-type (> (length keyboard-type) 0))
--- 897,903 ----
The variable `quail-keyboard-layout-type' holds the currently selected
keyboard type."
(interactive
! (list (completing-read "Keyboard type (default current choice): "
quail-keyboard-layout-alist
nil t)))
(or (and keyboard-type (> (length keyboard-type) 0))
diff -rN -c old-emacs-darcs.eclig/lisp/locate.el
new-emacs-darcs.eclig/lisp/locate.el
*** old-emacs-darcs.eclig/lisp/locate.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/locate.el Sat Sep 10 23:35:00 2005
***************
*** 209,215 ****
(input
(read-from-minibuffer
(if (> (length default) 0)
! (format "Locate (default `%s'): " default)
(format "Locate: "))
nil nil nil 'locate-history-list default t)))
(and (equal input "") default
--- 209,215 ----
(input
(read-from-minibuffer
(if (> (length default) 0)
! (format "Locate (default %s): " default)
(format "Locate: "))
nil nil nil 'locate-history-list default t)))
(and (equal input "") default
diff -rN -c old-emacs-darcs.eclig/lisp/mail/mailabbrev.el
new-emacs-darcs.eclig/lisp/mail/mailabbrev.el
*** old-emacs-darcs.eclig/lisp/mail/mailabbrev.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/mail/mailabbrev.el Sat Sep 10 23:35:00 2005
***************
*** 528,534 ****
(default-directory (expand-file-name "~/"))
(def mail-personal-alias-file))
(read-file-name
! (format "Read additional aliases from file: (default %s) "
def)
default-directory
(expand-file-name def default-directory)
--- 528,534 ----
(default-directory (expand-file-name "~/"))
(def mail-personal-alias-file))
(read-file-name
! (format "Read additional aliases from file (default %s): "
def)
default-directory
(expand-file-name def default-directory)
***************
*** 542,548 ****
(default-directory (expand-file-name "~/"))
(def mail-personal-alias-file))
(read-file-name
! (format "Read mail aliases from file: (default %s) " def)
default-directory
(expand-file-name def default-directory)
t))))
--- 542,548 ----
(default-directory (expand-file-name "~/"))
(def mail-personal-alias-file))
(read-file-name
! (format "Read mail aliases from file (default %s): " def)
default-directory
(expand-file-name def default-directory)
t))))
diff -rN -c old-emacs-darcs.eclig/lisp/mail/rmail.el
new-emacs-darcs.eclig/lisp/mail/rmail.el
*** old-emacs-darcs.eclig/lisp/mail/rmail.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/mail/rmail.el Sat Sep 10 23:34:59 2005
***************
*** 3038,3050 ****
(interactive
(let* ((reversep (< (prefix-numeric-value current-prefix-arg) 0))
(prompt
! (concat (if reversep "Reverse " "") "Rmail search (regexp): "))
regexp)
! (if rmail-search-last-regexp
! (setq prompt (concat prompt
! "(default "
! rmail-search-last-regexp
! ") ")))
(setq regexp (read-string prompt))
(cond ((not (equal regexp ""))
(setq rmail-search-last-regexp regexp))
--- 3038,3051 ----
(interactive
(let* ((reversep (< (prefix-numeric-value current-prefix-arg) 0))
(prompt
! (concat (if reversep "Reverse " "") "Rmail search (regexp"))
regexp)
! (setq prompt
! (concat prompt
! (if rmail-search-last-regex
! (concat ", default "
! rmail-search-last-regexp "): ")
! "): ")))
(setq regexp (read-string prompt))
(cond ((not (equal regexp ""))
(setq rmail-search-last-regexp regexp))
***************
*** 3109,3121 ****
(interactive
(let* ((reversep (>= (prefix-numeric-value current-prefix-arg) 0))
(prompt
! (concat (if reversep "Reverse " "") "Rmail search (regexp): "))
regexp)
! (if rmail-search-last-regexp
! (setq prompt (concat prompt
! "(default "
! rmail-search-last-regexp
! ") ")))
(setq regexp (read-string prompt))
(cond ((not (equal regexp ""))
(setq rmail-search-last-regexp regexp))
--- 3110,3123 ----
(interactive
(let* ((reversep (>= (prefix-numeric-value current-prefix-arg) 0))
(prompt
! (concat (if reversep "Reverse " "") "Rmail search (regexp"))
regexp)
! (setq prompt
! (concat prompt
! (if rmail-search-last-regex
! (concat ", default "
! rmail-search-last-regexp "): ")
! "): ")))
(setq regexp (read-string prompt))
(cond ((not (equal regexp ""))
(setq rmail-search-last-regexp regexp))
diff -rN -c old-emacs-darcs.eclig/lisp/mail/rmailout.el
new-emacs-darcs.eclig/lisp/mail/rmailout.el
*** old-emacs-darcs.eclig/lisp/mail/rmailout.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/mail/rmailout.el Sat Sep 10 23:35:00 2005
***************
*** 63,71 ****
(let ((read-file
(expand-file-name
(read-file-name
! (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))))
--- 63,71 ----
(let ((read-file
(expand-file-name
(read-file-name
! (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))))
***************
*** 95,103 ****
(let ((read-file
(expand-file-name
(read-file-name
! (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))))
--- 95,103 ----
(let ((read-file
(expand-file-name
(read-file-name
! (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))))
diff -rN -c old-emacs-darcs.eclig/lisp/mail/rmailsum.el
new-emacs-darcs.eclig/lisp/mail/rmailsum.el
*** old-emacs-darcs.eclig/lisp/mail/rmailsum.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/mail/rmailsum.el Sat Sep 10 23:34:59 2005
***************
*** 1346,1358 ****
(interactive
(let* ((reversep (>= (prefix-numeric-value current-prefix-arg) 0))
(prompt
! (concat (if reversep "Reverse " "") "Rmail search (regexp): "))
regexp)
! (if rmail-search-last-regexp
! (setq prompt (concat prompt
! "(default "
! rmail-search-last-regexp
! ") ")))
(setq regexp (read-string prompt))
(cond ((not (equal regexp ""))
(setq rmail-search-last-regexp regexp))
--- 1346,1359 ----
(interactive
(let* ((reversep (>= (prefix-numeric-value current-prefix-arg) 0))
(prompt
! (concat (if reversep "Reverse " "") "Rmail search (regexp"))
regexp)
! (setq prompt
! (concat prompt
! (if rmail-search-last-regex
! (concat ", default "
! rmail-search-last-regexp "): ")
! "): ")))
(setq regexp (read-string prompt))
(cond ((not (equal regexp ""))
(setq rmail-search-last-regexp regexp))
***************
*** 1377,1389 ****
(interactive
(let* ((reversep (< (prefix-numeric-value current-prefix-arg) 0))
(prompt
! (concat (if reversep "Reverse " "") "Rmail search (regexp): "))
regexp)
! (if rmail-search-last-regexp
! (setq prompt (concat prompt
! "(default "
! rmail-search-last-regexp
! ") ")))
(setq regexp (read-string prompt))
(cond ((not (equal regexp ""))
(setq rmail-search-last-regexp regexp))
--- 1378,1391 ----
(interactive
(let* ((reversep (< (prefix-numeric-value current-prefix-arg) 0))
(prompt
! (concat (if reversep "Reverse " "") "Rmail search (regexp"))
regexp)
! (setq prompt
! (concat prompt
! (if rmail-search-last-regex
! (concat ", default "
! rmail-search-last-regexp "): ")
! "): ")))
(setq regexp (read-string prompt))
(cond ((not (equal regexp ""))
(setq rmail-search-last-regexp regexp))
diff -rN -c old-emacs-darcs.eclig/lisp/man.el new-emacs-darcs.eclig/lisp/man.el
*** old-emacs-darcs.eclig/lisp/man.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/man.el Sat Sep 10 23:34:59 2005
***************
*** 663,672 ****
(interactive
(list (let* ((default-entry (Man-default-man-entry))
(input (read-string
! (format "Manual entry%s: "
(if (string= default-entry "")
! ""
! (format " (default %s)" default-entry)))
nil nil default-entry)))
(if (string= input "")
(error "No man args given")
--- 663,672 ----
(interactive
(list (let* ((default-entry (Man-default-man-entry))
(input (read-string
! (format "Manual entry%s"
(if (string= default-entry "")
! ": "
! (format " (default %s): " default-entry)))
nil nil default-entry)))
(if (string= input "")
(error "No man args given")
***************
*** 1273,1279 ****
(let* ((default (aheadsym Man-sections-alist))
(completion-ignore-case t)
chosen
! (prompt (concat "Go to section: (default " default ") ")))
(setq chosen (completing-read prompt Man-sections-alist))
(if (or (not chosen)
(string= chosen ""))
--- 1273,1279 ----
(let* ((default (aheadsym Man-sections-alist))
(completion-ignore-case t)
chosen
! (prompt (concat "Go to section (default " default "): ")))
(setq chosen (completing-read prompt Man-sections-alist))
(if (or (not chosen)
(string= chosen ""))
***************
*** 1328,1334 ****
Man-refpages-alist))
(aheadsym Man-refpages-alist)))
chosen
! (prompt (concat "Refer to: (default " default ") ")))
(setq chosen (completing-read prompt Man-refpages-alist))
(if (or (not chosen)
(string= chosen ""))
--- 1328,1334 ----
Man-refpages-alist))
(aheadsym Man-refpages-alist)))
chosen
! (prompt (concat "Refer to (default " default "): ")))
(setq chosen (completing-read prompt Man-refpages-alist))
(if (or (not chosen)
(string= chosen ""))
diff -rN -c old-emacs-darcs.eclig/lisp/mh-e/mh-comp.el
new-emacs-darcs.eclig/lisp/mh-e/mh-comp.el
*** old-emacs-darcs.eclig/lisp/mh-e/mh-comp.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/mh-e/mh-comp.el Sat Sep 10 23:34:59 2005
***************
*** 1424,1433 ****
and point after it."
(interactive
(list (mh-prompt-for-folder "Message from" mh-sent-from-folder nil)
! (read-input (format "Message number%s: "
(if (numberp mh-sent-from-msg)
! (format " [%d]" mh-sent-from-msg)
! "")))
current-prefix-arg))
(save-restriction
(narrow-to-region (point) (point))
--- 1424,1433 ----
and point after it."
(interactive
(list (mh-prompt-for-folder "Message from" mh-sent-from-folder nil)
! (read-input (concat "Message number"
(if (numberp mh-sent-from-msg)
! (format " (default %d): " mh-sent-from-msg)
! ": ")))
current-prefix-arg))
(save-restriction
(narrow-to-region (point) (point))
diff -rN -c old-emacs-darcs.eclig/lisp/mh-e/mh-mime.el
new-emacs-darcs.eclig/lisp/mh-e/mh-mime.el
*** old-emacs-darcs.eclig/lisp/mh-e/mh-mime.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/mh-e/mh-mime.el Sat Sep 10 23:34:59 2005
***************
*** 81,90 ****
(interactive (list
(read-string "Forw Content-description: ")
(mh-prompt-for-folder "Message from" mh-sent-from-folder nil)
! (read-string (format "Messages%s: "
(if (numberp mh-sent-from-msg)
! (format " [%d]" mh-sent-from-msg)
! "")))))
(if (equal mh-compose-insertion 'gnus)
(mh-mml-forward-message description folder message)
(mh-mhn-compose-forw description folder message)))
--- 81,90 ----
(interactive (list
(read-string "Forw Content-description: ")
(mh-prompt-for-folder "Message from" mh-sent-from-folder nil)
! (read-string (concat "Messages"
(if (numberp mh-sent-from-msg)
! (format " (default %d): "
mh-sent-from-msg)
! ": ")))))
(if (equal mh-compose-insertion 'gnus)
(mh-mml-forward-message description folder message)
(mh-mhn-compose-forw description folder message)))
***************
*** 374,383 ****
(interactive (list
(read-string "Forw Content-description: ")
(mh-prompt-for-folder "Message from" mh-sent-from-folder nil)
! (read-string (format "Messages%s: "
(if (numberp mh-sent-from-msg)
! (format " [%d]" mh-sent-from-msg)
! "")))))
(beginning-of-line)
(insert "#forw [")
(and description
--- 374,383 ----
(interactive (list
(read-string "Forw Content-description: ")
(mh-prompt-for-folder "Message from" mh-sent-from-folder nil)
! (read-string (concat "Messages"
(if (numberp mh-sent-from-msg)
! (format " (default %d): "
mh-sent-from-msg)
! ": ")))))
(beginning-of-line)
(insert "#forw [")
(and description
diff -rN -c old-emacs-darcs.eclig/lisp/mh-e/mh-utils.el
new-emacs-darcs.eclig/lisp/mh-e/mh-utils.el
*** old-emacs-darcs.eclig/lisp/mh-e/mh-utils.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/mh-e/mh-utils.el Sat Sep 10 23:26:28 2005
***************
*** 2315,2324 ****
when used in searching."
(if (null default)
(setq default ""))
! (let* ((default-string (cond (default-string (format "[%s] "
default-string))
((equal "" default) "")
! (t (format "[%s] " default))))
! (prompt (format "%s folder: %s" prompt default-string))
(mh-current-folder-name mh-current-folder)
read-name folder-name)
(while (and (setq read-name (mh-folder-completing-read
--- 2315,2324 ----
when used in searching."
(if (null default)
(setq default ""))
! (let* ((default-string (cond (default-string (format " (default %s)"
default-string))
((equal "" default) "")
! (t (format " (default %s)" default))))
! (prompt (format "%s folder%s: " prompt default-string))
(mh-current-folder-name mh-current-folder)
read-name folder-name)
(while (and (setq read-name (mh-folder-completing-read
diff -rN -c old-emacs-darcs.eclig/lisp/net/rcompile.el
new-emacs-darcs.eclig/lisp/net/rcompile.el
*** old-emacs-darcs.eclig/lisp/net/rcompile.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/net/rcompile.el Sun Sep 11 15:04:26 2005
***************
*** 138,144 ****
remote-compile-host)
user (if remote-compile-prompt-for-user
(read-from-minibuffer (format
! "Compile by user (default %s)"
(or remote-compile-user
(user-login-name)))
"" nil nil
--- 138,144 ----
remote-compile-host)
user (if remote-compile-prompt-for-user
(read-from-minibuffer (format
! "Compile by user (default %s): "
(or remote-compile-user
(user-login-name)))
"" nil nil
diff -rN -c old-emacs-darcs.eclig/lisp/play/animate.el
new-emacs-darcs.eclig/lisp/play/animate.el
*** old-emacs-darcs.eclig/lisp/play/animate.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/play/animate.el Sun Sep 11 15:04:26 2005
***************
*** 156,162 ****
(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\"): "
nil nil "Sarah")))
;; Make a suitable buffer to display the birthday present in.
(switch-to-buffer (get-buffer-create (format "*%s*" name)))
--- 156,162 ----
(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): "
nil nil "Sarah")))
;; Make a suitable buffer to display the birthday present in.
(switch-to-buffer (get-buffer-create (format "*%s*" name)))
diff -rN -c old-emacs-darcs.eclig/lisp/printing.el
new-emacs-darcs.eclig/lisp/printing.el
*** old-emacs-darcs.eclig/lisp/printing.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/printing.el Sun Sep 11 15:04:26 2005
***************
*** 4,10 ****
;; Author: Vinicius Jose Latorre <address@hidden>
;; Maintainer: Vinicius Jose Latorre <address@hidden>
! ;; Time-stamp: <2005/06/11 19:51:32 vinicius>
;; Keywords: wp, print, PostScript
;; Version: 6.8.4
;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
--- 4,10 ----
;; Author: Vinicius Jose Latorre <address@hidden>
;; Maintainer: Vinicius Jose Latorre <address@hidden>
! ;; Time-stamp: <2005-09-11 15:04:26 ecl>
;; Keywords: wp, print, PostScript
;; Version: 6.8.4
;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
***************
*** 5704,5710 ****
(defun pr-interactive-n-up (mess)
(or (stringp mess) (setq mess "*"))
(save-match-data
! (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)
--- 5704,5710 ----
(defun pr-interactive-n-up (mess)
(or (stringp mess) (setq mess "*"))
(save-match-data
! (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)
diff -rN -c old-emacs-darcs.eclig/lisp/progmodes/antlr-mode.el
new-emacs-darcs.eclig/lisp/progmodes/antlr-mode.el
*** old-emacs-darcs.eclig/lisp/progmodes/antlr-mode.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/progmodes/antlr-mode.el Sat Sep 10 20:24:16 2005
***************
*** 1410,1416 ****
(not (antlr-outside-rule-p)))))
(defunx antlr-end-of-rule (&optional arg)
! "Move forward to next end of rule. Do it ARG [default: 1] many times.
A grammar class header and the file prelude are also considered as a
rule. Negative argument ARG means move back to ARGth preceding end of
rule. If ARG is zero, run `antlr-end-of-body'."
--- 1410,1416 ----
(not (antlr-outside-rule-p)))))
(defunx antlr-end-of-rule (&optional arg)
! "Move forward to next end of rule. Do it ARG (default 1) many times.
A grammar class header and the file prelude are also considered as a
rule. Negative argument ARG means move back to ARGth preceding end of
rule. If ARG is zero, run `antlr-end-of-body'."
diff -rN -c old-emacs-darcs.eclig/lisp/progmodes/compile.el
new-emacs-darcs.eclig/lisp/progmodes/compile.el
*** old-emacs-darcs.eclig/lisp/progmodes/compile.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/progmodes/compile.el Sun Sep 11 15:04:26 2005
***************
*** 1769,1775 ****
marker)
(let ((name (expand-file-name
(read-file-name
! (format "Find this %s in: (default %s) "
compilation-error filename)
dir filename t))))
(if (file-directory-p name)
--- 1769,1775 ----
marker)
(let ((name (expand-file-name
(read-file-name
! (format "Find this %s in (default %s): "
compilation-error filename)
dir filename t))))
(if (file-directory-p name)
diff -rN -c old-emacs-darcs.eclig/lisp/progmodes/etags.el
new-emacs-darcs.eclig/lisp/progmodes/etags.el
*** old-emacs-darcs.eclig/lisp/progmodes/etags.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/progmodes/etags.el Sun Sep 11 15:04:26 2005
***************
*** 284,290 ****
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) "
default-directory
(expand-file-name "TAGS"
default-directory)
--- 284,290 ----
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): "
default-directory
(expand-file-name "TAGS"
default-directory)
***************
*** 590,596 ****
(car list))
;; Finally, prompt the user for a file name.
(expand-file-name
! (read-file-name "Visit tags table: (default TAGS) "
default-directory
"TAGS"
t))))))
--- 590,596 ----
(car list))
;; Finally, prompt the user for a file name.
(expand-file-name
! (read-file-name "Visit tags table (default TAGS): "
default-directory
"TAGS"
t))))))
diff -rN -c old-emacs-darcs.eclig/lisp/progmodes/pascal.el
new-emacs-darcs.eclig/lisp/progmodes/pascal.el
*** old-emacs-darcs.eclig/lisp/progmodes/pascal.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/progmodes/pascal.el Sun Sep 11 15:04:25 2005
***************
*** 1470,1476 ****
default ""))
(label (if (not (string= default ""))
;; Do completion with default
! (completing-read (concat "Label: (default " default ") ")
'pascal-comp-defun nil t "")
;; There is no default value. Complete without it
(completing-read "Label: "
--- 1470,1476 ----
default ""))
(label (if (not (string= default ""))
;; Do completion with default
! (completing-read (concat "Label (default " default "): ")
'pascal-comp-defun nil t "")
;; There is no default value. Complete without it
(completing-read "Label: "
diff -rN -c old-emacs-darcs.eclig/lisp/ps-print.el
new-emacs-darcs.eclig/lisp/ps-print.el
*** old-emacs-darcs.eclig/lisp/ps-print.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/ps-print.el Sun Sep 11 15:04:25 2005
***************
*** 4663,4669 ****
(let* ((name (concat (file-name-nondirectory (or (buffer-file-name)
(buffer-name)))
".ps"))
! (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)
--- 4663,4669 ----
(let* ((name (concat (file-name-nondirectory (or (buffer-file-name)
(buffer-name)))
".ps"))
! (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)
diff -rN -c old-emacs-darcs.eclig/lisp/rect.el
new-emacs-darcs.eclig/lisp/rect.el
*** old-emacs-darcs.eclig/lisp/rect.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/rect.el Sun Sep 11 15:04:25 2005
***************
*** 332,338 ****
(list
(region-beginning)
(region-end)
! (read-string (format "String rectangle (default `%s'): "
(or (car string-rectangle-history) ""))
nil 'string-rectangle-history
(car string-rectangle-history)))))
--- 332,338 ----
(list
(region-beginning)
(region-end)
! (read-string (format "String rectangle (default %s): "
(or (car string-rectangle-history) ""))
nil 'string-rectangle-history
(car string-rectangle-history)))))
***************
*** 353,359 ****
(list
(region-beginning)
(region-end)
! (read-string (format "String insert rectangle (default `%s'): "
(or (car string-rectangle-history) ""))
nil 'string-rectangle-history
(car string-rectangle-history)))))
--- 353,359 ----
(list
(region-beginning)
(region-end)
! (read-string (format "String insert rectangle (default %s): "
(or (car string-rectangle-history) ""))
nil 'string-rectangle-history
(car string-rectangle-history)))))
diff -rN -c old-emacs-darcs.eclig/lisp/replace.el
new-emacs-darcs.eclig/lisp/replace.el
*** old-emacs-darcs.eclig/lisp/replace.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/replace.el Sun Sep 11 15:04:25 2005
***************
*** 907,913 ****
(input
(read-from-minibuffer
(if default
! (format "List lines matching regexp (default `%s'): "
(query-replace-descr default))
"List lines matching regexp: ")
nil
--- 907,913 ----
(input
(read-from-minibuffer
(if default
! (format "List lines matching regexp (default %s): "
(query-replace-descr default))
"List lines matching regexp: ")
nil
diff -rN -c old-emacs-darcs.eclig/lisp/shadowfile.el
new-emacs-darcs.eclig/lisp/shadowfile.el
*** old-emacs-darcs.eclig/lisp/shadowfile.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/shadowfile.el Sat Sep 10 20:24:15 2005
***************
*** 438,444 ****
(sit-for 2))
try-regexp))
; (username (read-no-blanks-input
! ; (format "Username [default: %s]: "
; (shadow-get-user primary))
; (if old (or (shadow-cluster-username old) "")
; (user-login-name))))
--- 438,444 ----
(sit-for 2))
try-regexp))
; (username (read-no-blanks-input
! ; (format "Username (default %s): "
; (shadow-get-user primary))
; (if old (or (shadow-cluster-username old) "")
; (user-login-name))))
***************
*** 458,464 ****
(name (nth 2 hup))
user site group)
(while (setq site (shadow-read-site))
! (setq user (read-string (format "Username [default %s]: "
(shadow-get-user site)))
name (read-string "Filename: " name))
(setq group (cons (shadow-make-fullname site
--- 458,464 ----
(name (nth 2 hup))
user site group)
(while (setq site (shadow-read-site))
! (setq user (read-string (format "Username (default %s): "
(shadow-get-user site)))
name (read-string "Filename: " name))
(setq group (cons (shadow-make-fullname site
diff -rN -c old-emacs-darcs.eclig/lisp/terminal.el
new-emacs-darcs.eclig/lisp/terminal.el
*** old-emacs-darcs.eclig/lisp/terminal.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/terminal.el Sun Sep 11 15:04:25 2005
***************
*** 1115,1121 ****
(getenv "SHELL")
"/bin/sh"))
(s (read-string
! (format "Run program in emulator: (default %s) "
default-s))))
(if (equal s "")
(list default-s '())
--- 1115,1121 ----
(getenv "SHELL")
"/bin/sh"))
(s (read-string
! (format "Run program in emulator (default %s): "
default-s))))
(if (equal s "")
(list default-s '())
diff -rN -c old-emacs-darcs.eclig/lisp/textmodes/artist.el
new-emacs-darcs.eclig/lisp/textmodes/artist.el
*** old-emacs-darcs.eclig/lisp/textmodes/artist.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/textmodes/artist.el Sun Sep 11 15:04:25 2005
***************
*** 2863,2871 ****
"Read any extra arguments for figlet."
(interactive)
(let* ((avail-fonts (artist-figlet-get-font-list))
! (font (completing-read (concat "Select font: (default "
artist-figlet-default-font
! ") ")
(mapcar
(lambda (font) (cons font font))
avail-fonts))))
--- 2863,2871 ----
"Read any extra arguments for figlet."
(interactive)
(let* ((avail-fonts (artist-figlet-get-font-list))
! (font (completing-read (concat "Select font (default "
artist-figlet-default-font
! "): ")
(mapcar
(lambda (font) (cons font font))
avail-fonts))))
diff -rN -c old-emacs-darcs.eclig/lisp/textmodes/refer.el
new-emacs-darcs.eclig/lisp/textmodes/refer.el
*** old-emacs-darcs.eclig/lisp/textmodes/refer.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/textmodes/refer.el Sun Sep 11 15:04:25 2005
***************
*** 339,345 ****
(list (expand-file-name
(if (eq major-mode 'bibtex-mode)
(read-file-name
! (format ".bib file: (default %s) "
(file-name-nondirectory
(buffer-file-name)))
(file-name-directory (buffer-file-name))
--- 339,345 ----
(list (expand-file-name
(if (eq major-mode 'bibtex-mode)
(read-file-name
! (format ".bib file (default %s): "
(file-name-nondirectory
(buffer-file-name)))
(file-name-directory (buffer-file-name))
diff -rN -c old-emacs-darcs.eclig/lisp/textmodes/reftex-auc.el
new-emacs-darcs.eclig/lisp/textmodes/reftex-auc.el
*** old-emacs-darcs.eclig/lisp/textmodes/reftex-auc.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/textmodes/reftex-auc.el Sun Sep 11 15:04:25 2005
***************
*** 69,75 ****
(t
(setq prompt (concat (if optional "(Optional) " "")
(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)))
--- 69,75 ----
(t
(setq prompt (concat (if optional "(Optional) " "")
(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)))
***************
*** 81,87 ****
(let (tag taglist)
(setq prompt (concat (if optional "(Optional) " "")
(if prompt prompt "Index tag")
! ": (default none) "))
(if (and reftex-support-index (reftex-plug-flag 4))
;; Use RefTeX completion
(progn
--- 81,87 ----
(let (tag taglist)
(setq prompt (concat (if optional "(Optional) " "")
(if prompt prompt "Index tag")
! " (default none): "))
(if (and reftex-support-index (reftex-plug-flag 4))
;; Use RefTeX completion
(progn
diff -rN -c old-emacs-darcs.eclig/lisp/textmodes/reftex-index.el
new-emacs-darcs.eclig/lisp/textmodes/reftex-index.el
*** old-emacs-darcs.eclig/lisp/textmodes/reftex-index.el Sun Sep 11
15:38:03 2005
--- new-emacs-darcs.eclig/lisp/textmodes/reftex-index.el Sat Sep 10
20:24:14 2005
***************
*** 173,180 ****
(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))))
(if (and default (equal tag "")) (setq tag default))
(reftex-update-default-index tag)
--- 173,187 ----
(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)
diff -rN -c old-emacs-darcs.eclig/lisp/vc-mcvs.el
new-emacs-darcs.eclig/lisp/vc-mcvs.el
*** old-emacs-darcs.eclig/lisp/vc-mcvs.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/vc-mcvs.el Sat Sep 10 20:24:12 2005
***************
*** 225,231 ****
;; 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]: "
'("default" "name-only" "keep-old"
"binary" "value-only")
nil t nil nil "default")))
--- 225,231 ----
;; 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): "
'("default" "name-only" "keep-old"
"binary" "value-only")
nil t nil nil "default")))
diff -rN -c old-emacs-darcs.eclig/lisp/vc.el new-emacs-darcs.eclig/lisp/vc.el
*** old-emacs-darcs.eclig/lisp/vc.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/vc.el Sun Sep 11 15:04:25 2005
***************
*** 1707,1713 ****
(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-directory buffer-file-name t)))
(rev1-default nil) (rev2-default nil))
--- 1707,1713 ----
(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-directory buffer-file-name t)))
(rev1-default nil) (rev2-default nil))
***************
*** 1728,1741 ****
;; construct argument list
(list file
(read-string (if 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): ")
nil nil rev2-default))))
(if (file-directory-p file)
;; recursive directory diff
--- 1728,1741 ----
;; construct argument list
(list file
(read-string (if 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): ")
nil nil rev2-default))))
(if (file-directory-p file)
;; recursive directory diff
***************
*** 1998,2004 ****
(error "Merge aborted"))))
(setq first-version
(read-string (concat "Branch or version to merge from "
! "(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)
--- 1998,2004 ----
(error "Merge aborted"))))
(setq first-version
(read-string (concat "Branch or version to merge from "
! "(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)
***************
*** 3075,3081 ****
(bfn buffer-file-name)
(vc-annotate-version
(if prefix (read-string
! (format "Annotate from version: (default %s) " rev)
nil nil rev)
rev)))
(if display-mode
--- 3075,3081 ----
(bfn buffer-file-name)
(vc-annotate-version
(if prefix (read-string
! (format "Annotate from version (default %s): " rev)
nil nil rev)
rev)))
(if display-mode
***************
*** 3083,3089 ****
(if prefix
(setq vc-annotate-display-mode
(float (string-to-number
! (read-string "Annotate span days: (default 20) "
nil nil "20"))))))
(setq temp-buffer-name (format "*Annotate %s (rev %s)*"
(buffer-name) vc-annotate-version))
--- 3083,3089 ----
(if prefix
(setq vc-annotate-display-mode
(float (string-to-number
! (read-string "Annotate span days (default 20): "
nil nil "20"))))))
(setq temp-buffer-name (format "*Annotate %s (rev %s)*"
(buffer-name) vc-annotate-version))
diff -rN -c old-emacs-darcs.eclig/lisp/w32-fns.el
new-emacs-darcs.eclig/lisp/w32-fns.el
*** old-emacs-darcs.eclig/lisp/w32-fns.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/w32-fns.el Sun Sep 11 15:04:25 2005
***************
*** 283,289 ****
(interactive
(list (let ((default locale-coding-system))
(read-coding-system
! (format "Coding system for system calls (default, %s): "
default)
default))))
(check-coding-system coding-system)
--- 283,289 ----
(interactive
(list (let ((default locale-coding-system))
(read-coding-system
! (format "Coding system for system calls (default %s): "
default)
default))))
(check-coding-system coding-system)
diff -rN -c old-emacs-darcs.eclig/lisp/wid-edit.el
new-emacs-darcs.eclig/lisp/wid-edit.el
*** old-emacs-darcs.eclig/lisp/wid-edit.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/wid-edit.el Sun Sep 11 15:04:25 2005
***************
*** 1134,1140 ****
(make-variable-buffer-local 'widget-field-list)
(defun widget-at (&optional pos)
! "The button or field at POS (default, point)."
(or (get-char-property (or pos (point)) 'button)
(widget-field-at pos)))
--- 1134,1140 ----
(make-variable-buffer-local 'widget-field-list)
(defun widget-at (&optional pos)
! "The button or field at POS (default point)."
(or (get-char-property (or pos (point)) 'button)
(widget-field-at pos)))
***************
*** 3018,3024 ****
(abbreviate-file-name
(if unbound
(read-file-name prompt)
! (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)))
--- 3018,3024 ----
(abbreviate-file-name
(if unbound
(read-file-name prompt)
! (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)))
***************
*** 3031,3037 ****
;;; (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 "') ")
;;; dir nil must-match file)))
;;; (widget-value-set widget (abbreviate-file-name answer))
;;; (widget-setup)
--- 3031,3037 ----
;;; (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 "): ")
;;; dir nil must-match file)))
;;; (widget-value-set widget (abbreviate-file-name answer))
;;; (widget-setup)
***************
*** 3135,3144 ****
"Read coding-system from minibuffer."
(if (widget-get widget :base-only)
(intern
! (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)))
(defun widget-coding-system-action (widget &optional event)
(let ((answer
--- 3135,3144 ----
"Read coding-system from minibuffer."
(if (widget-get widget :base-only)
(intern
! (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)))
(defun widget-coding-system-action (widget &optional event)
(let ((answer
diff -rN -c old-emacs-darcs.eclig/lisp/woman.el
new-emacs-darcs.eclig/lisp/woman.el
*** old-emacs-darcs.eclig/lisp/woman.el Sun Sep 11 15:38:03 2005
--- new-emacs-darcs.eclig/lisp/woman.el Sun Sep 11 15:04:25 2005
***************
*** 1233,1239 ****
(setq topic
(completing-read
(if default
! (format "Manual entry (default `%s'): " default)
"Manual entry: ")
woman-topic-all-completions nil 1
nil
--- 1233,1239 ----
(setq topic
(completing-read
(if default
! (format "Manual entry (default %s): " default)
"Manual entry: ")
woman-topic-all-completions nil 1
nil
Patch ends here
- Patch: Follow convention for reading with the minibuffer., Emilio Lopes, 2005/09/06
- Re: Patch: Follow convention for reading with the minibuffer., Stefan Monnier, 2005/09/06
- Re: Patch: Follow convention for reading with the minibuffer., Richard M. Stallman, 2005/09/07
- Re: Patch: Follow convention for reading with the minibuffer., Juri Linkov, 2005/09/08
- Re: Patch: Follow convention for reading with the minibuffer., Richard M. Stallman, 2005/09/09
- RE: Patch: Follow convention for reading with the minibuffer., Drew Adams, 2005/09/09
- Re: Patch: Follow convention for reading with the minibuffer., Thien-Thi Nguyen, 2005/09/09
- Re: Patch: Follow convention for reading with the minibuffer., Stefan Monnier, 2005/09/09
Re: Patch: Follow convention for reading with the minibuffer.,
Emilio Lopes <=
Re: Patch: Follow convention for reading with the minibuffer., Juri Linkov, 2005/09/29
Re: Patch: Follow convention for reading with the minibuffer., Romain Francoise, 2005/09/30
Re: Patch: Follow convention for reading with the minibuffer., Richard M. Stallman, 2005/09/30