mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-22 07:09:47 +00:00
Code

Merge branch 'maint'

Browse Source
This commit is contained in:
Kyle Meyer 2016-03-11 22:51:07 -05:00
commit dade0d5b28
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/org-agenda.el
View File

@ -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."

7
lisp/org-footnote.el
View File

@ -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)

2
lisp/org-protocol.el
View File

@ -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)

17
lisp/org-table.el
View File

@ -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.")))))