diff options
author | Kyle Meyer <kyle@kyleam.com> | 2016-03-11 22:51:07 -0500 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2016-03-11 22:51:07 -0500 |
commit | dade0d5b2896d6afbc351dca9ac80382ac1f890b (patch) | |
tree | d9490c9032bf6261dfcc7d80a64a0d30e06e7f6b | |
parent | e69e18dd71bdf0c9bae9546bf026a1123b9a8c53 (diff) | |
parent | ebacca39b4e6b01f6f47e2aeb9a1decad09565ac (diff) | |
download | org-mode-dade0d5b2896d6afbc351dca9ac80382ac1f890b.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-agenda.el | 5 | ||||
-rw-r--r-- | lisp/org-footnote.el | 7 | ||||
-rw-r--r-- | lisp/org-protocol.el | 2 | ||||
-rw-r--r-- | lisp/org-table.el | 17 |
4 files changed, 14 insertions, 17 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 876ea44..cd69c74 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -10107,8 +10107,9 @@ tag and (if present) the flagging note." (replace-match "\n" t t)) (goto-char (point-min)) (select-window win) - (message (substitute-command-keys "Flagging note pushed to kill ring. \ -Press \\[org-agenda-show-the-flagging-note] again to remove tag and note"))))) + (message "%s" (substitute-command-keys "Flagging note pushed to \ +kill ring. Press \\[org-agenda-show-the-flagging-note] again to remove \ +tag and note"))))) (defun org-agenda-remove-flag (marker) "Remove the FLAGGED tag and any flagging note in the entry." diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el index e80685a..a847326 100644 --- a/lisp/org-footnote.el +++ b/lisp/org-footnote.el @@ -531,10 +531,9 @@ value if point was successfully moved." (goto-char (match-end 0)) (org-show-context 'link-search) (when (derived-mode-p 'org-mode) - (message - (substitute-command-keys - "Edit definition and go back with `\\[org-mark-ring-goto]' or, if \ -unique, with `\\[org-ctrl-c-ctrl-c]'."))) + (message "%s" (substitute-command-keys + "Edit definition and go back with \ +`\\[org-mark-ring-goto]' or, if unique, with `\\[org-ctrl-c-ctrl-c]'."))) t)) (defun org-footnote-goto-previous-reference (label) diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el index a249c9e..6510733 100644 --- a/lisp/org-protocol.el +++ b/lisp/org-protocol.el @@ -669,7 +669,7 @@ delegates most of the work to `org-protocol-create'." (require 'org-publish) (let ((all (or (org-publish-get-project-from-filename buffer-file-name)))) (if all (org-protocol-create (cdr all)) - (message "Not in an org-project. Did mean %s?" + (message "Not in an org-project. Did you mean `%s'?" (substitute-command-keys"\\[org-protocol-create]"))))) (defun org-protocol-create (&optional project-plist) diff --git a/lisp/org-table.el b/lisp/org-table.el index 488c912..0b68ddd 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -795,9 +795,8 @@ When nil, simply write \"#ERROR\" in corrupted fields.") (org-add-props x nil 'help-echo (concat - (substitute-command-keys - "Clipped table field, use \\[org-table-edit-field] to \ -edit. Full value is:\n") + "Clipped table field, use `\\[org-table-edit-field]' to \ +edit. Full value is:\n" (substring-no-properties x))) (let ((l (length x)) (f1 (min fmax @@ -2136,11 +2135,10 @@ If NLAST is a number, only the NLAST fields will actually be summed." s diff) (format "%.0f:%02.0f:%02.0f" h m s)))) (kill-new sres) - (if (org-called-interactively-p 'interactive) - (message "%s" - (substitute-command-keys - (format "Sum of %d items: %-20s (\\[yank] will insert result into buffer)" - (length numbers) sres)))) + (when (org-called-interactively-p 'interactive) + (message "%s" (substitute-command-keys + (format "Sum of %d items: %-20s \ +\(\\[yank] will insert result into buffer)" (length numbers) sres)))) sres)))) (defun org-table-get-number-for-summing (s) @@ -3591,8 +3589,7 @@ Parameters get priority." (when (eq org-table-use-standard-references t) (org-table-fedit-toggle-ref-type)) (org-goto-line startline) - (message - (substitute-command-keys "\\<org-mode-map>\ + (message "%s" (substitute-command-keys "\\<org-mode-map>\ Edit formulas, finish with `\\[org-ctrl-c-ctrl-c]' or `\\[org-edit-special]'. \ See menu for more commands."))))) |