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/calendar | |
| parent | ff441d3508add9eed3c5217ae7b0a8800b9fc917 (diff) | |
| download | emacs-5e63c842007b0f85e91735a7c4e00be0b7fe9ba5.tar.gz | |
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/calendar')
| -rw-r--r-- | lisp/calendar/diary-lib.el | 6 | ||||
| -rw-r--r-- | lisp/calendar/todo-mode.el | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index ec02900f495..b21fc687144 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -910,10 +910,12 @@ This is recursive; that is, included files may include other files." (diary-list-entries original-date number t))))) (display-warning :error - (format "Can't read included diary file %s\n" diary-file))) + (format-message "Can't read included diary file %s\n" + diary-file))) (display-warning :error - (format "Can't find included diary file %s\n" diary-file))))) + (format-message "Can't find included diary file %s\n" + diary-file))))) (goto-char (point-min))) (defun diary-include-other-diary-files () diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index 925d00866d1..83f2fedf25b 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el @@ -237,7 +237,8 @@ The final element is \"*\", indicating an unspecified month.") (when (string= (widget-value widget) todo-item-mark) (widget-put widget :error - "Invalid value: must be distinct from ‘todo-item-mark’") + (format-message + "Invalid value: must be distinct from ‘todo-item-mark’")) widget))) :initialize 'custom-initialize-default :set 'todo-reset-prefix @@ -1694,7 +1695,8 @@ only when no items are marked." (when (string= (widget-value widget) todo-prefix) (widget-put widget :error - "Invalid value: must be distinct from ‘todo-prefix’") + (format-message + "Invalid value: must be distinct from ‘todo-prefix’")) widget))) :set (lambda (symbol value) (custom-set-default symbol (propertize value 'face 'todo-mark))) |