Merge branch 'master' of code.orgmode.org:bzg/org-mode

This commit is contained in:
Bastien 2018-11-16 07:47:17 +01:00
commit 7be6760599
1 changed files with 4 additions and 3 deletions

View File

@ -4715,8 +4715,9 @@ for a keyword. A numeric prefix directly selects the Nth keyword in
org-select-this-todo-keyword))
(setq pos (point))
(unless org-agenda-multi
(insert (substitute-command-keys "Available with \
\\<org-agenda-mode-map>`N \\[org-agenda-redo]': (0)[ALL]"))
(insert (substitute-command-keys "Press \
\\<org-agenda-mode-map>`N \\[org-agenda-redo]' (e.g. `0 \\[org-agenda-redo]') \
to search again: (0)[ALL]"))
(let ((n 0))
(dolist (k kwds)
(let ((s (format "(%d)%s" (cl-incf n) k)))
@ -4819,7 +4820,7 @@ The prefix arg TODO-ONLY limits the search to TODO entries."
(insert (substitute-command-keys
"Press \
\\<org-agenda-mode-map>`\\[universal-argument] \\[org-agenda-redo]' \
to search again with new search string\n")))
to search again\n")))
(add-text-properties pos (1- (point))
(list 'face 'org-agenda-structure))
(buffer-string)))