diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-28 22:24:10 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-28 22:25:09 -0700 |
| commit | 5e63c842007b0f85e91735a7c4e00be0b7fe9ba5 (patch) | |
| tree | ebef360bed879a59b45e167f9679e6bbbe9369c7 /lisp/vc/pcvs.el | |
| parent | ff441d3508add9eed3c5217ae7b0a8800b9fc917 (diff) | |
| download | emacs-5e63c842007b0f85e91735a7c4e00be0b7fe9ba5.tar.gz emacs-5e63c842007b0f85e91735a7c4e00be0b7fe9ba5.tar.bz2 emacs-5e63c842007b0f85e91735a7c4e00be0b7fe9ba5.zip | |
Fix minor text quoting in calc, calendar, vc
* lisp/calc/calc-ext.el (calc-shift-Z-prefix-help):
* lisp/calc/calc-help.el (calc-j-prefix-help):
* lisp/calc/calc-misc.el (calc-help):
* lisp/calc/calc.el (calc-algebraic-mode, calc-mode):
Escape an apostrophe in a docstring.
* lisp/calc/calc-forms.el (calc-hms-notation):
* lisp/calc/calc-mode.el (calc-display-raw, calc-algebraic-mode):
Escape an apostrophe in a diagnostic.
* lisp/calc/calc-misc.el (calc-help):
* lisp/calendar/diary-lib.el (diary-include-files):
* lisp/calendar/todo-mode.el (todo-prefix, todo-item-mark):
* lisp/vc/diff-mode.el (diff-delete-trailing-whitespace):
* lisp/vc/ediff-diff.el (ediff-same-contents):
* lisp/vc/ediff-merg.el (ediff-re-merge):
* lisp/vc/ediff-ptch.el (ediff-patch-file-internal):
* lisp/vc/ediff-util.el (ediff-test-save-region)
(ediff-status-info):
* lisp/vc/ediff.el (ediff-merge-revisions)
(ediff-merge-revisions-with-ancestor):
* lisp/vc/pcvs.el (cvs-mode-checkout, cvs-vc-command-advice):
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
Respect text quoting style in doc string or diagnostic.
* lisp/calc/calc-prog.el (calc-kbd-push, calc-kbd-pop):
* lisp/vc/add-log.el (change-log-goto-source):
Avoid double-formatting.
* lisp/vc/ediff-init.el (format-message):
New backward-compatibility alias.
Diffstat (limited to 'lisp/vc/pcvs.el')
| -rw-r--r-- | lisp/vc/pcvs.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el index 6d8e5374145..f6a9e08d84b 100644 --- a/lisp/vc/pcvs.el +++ b/lisp/vc/pcvs.el @@ -968,10 +968,10 @@ With a prefix argument, prompt for cvs FLAGS to use." The files are stored to DIR." (interactive (let* ((branch (cvs-prefix-get 'cvs-branch-prefix)) - (prompt (format "CVS Checkout Directory for `%s%s': " - (cvs-get-module) - (if branch (format " (branch: %s)" branch) - "")))) + (prompt (format-message "CVS Checkout Directory for `%s%s': " + (cvs-get-module) + (if branch (format " (branch: %s)" branch) + "")))) (list (read-directory-name prompt nil default-directory nil)))) (let ((modules (split-string-and-unquote (cvs-get-module))) (flags (cvs-add-branch-prefix @@ -2403,9 +2403,9 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (goto-char (point-min)) (looking-at ".*to add this file permanently\n\\'")) (dolist (file (if (listp files) files (list files))) - (insert "cvs add: scheduling file `" - (file-name-nondirectory file) - "' for addition\n"))) + (insert (format-message + "cvs add: scheduling file `%s' for addition\n" + (file-name-nondirectory file))))) ;; VC never (?) does `cvs -n update' so dcd=nil ;; should probably always be the right choice. (cvs-parse-process nil subdir)))))))) |