branch: externals/org
commit 23653c321a6c44d32dbeaf580b6aae45e9606bee
Merge: b7a75ece50 f8de8cf72a
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Merge branch 'bugfix'
---
etc/ORG-NEWS | 4 ++--
lisp/org-agenda.el | 2 +-
lisp/org.el | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 12062e95c1..7eced37470 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -201,7 +201,7 @@ considered the official successor.
Org links support a new parameter =:preview= that can be used to
preview arbitrary link types. The value of this parameter should be a
function that is called to preview links of the corresponding type
-(see ~org-link-parameters~).
+(see ~org-link-parameters~).
The new preview system does not bring any brand-new link previews, but
open the possibility for third-party packages to implement custom previews
@@ -503,7 +503,7 @@ will be used as a directory to save the image to.
Candidate refile targets may now be specified with the symbol ~t~ to
indicate that all headlines within the specified file are to be
-considered. For example, setting ~org-refile-targets~ to ~((nil . t))~
+considered. For example, setting ~org-refile-targets~ to ~((nil . t))~
will allow one to refile to any heading within the current buffer.
*** In =ob-ditaa=, the output type is now controlled consistently with other
babel backends
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 106a0919b7..dd86a716ac 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -1762,7 +1762,7 @@ meaning:
%b show breadcrumbs, i.e., the names of the higher levels
%(expression) Eval `(EXPRESSION)' and replace the control string by
the result.
-
+
`(EXPRESSION)' is evaluated with point and buffer associated with
agenda entry/line being rendered. For example, heading lines will be
diff --git a/lisp/org.el b/lisp/org.el
index c899c0dd06..c304ab9472 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6203,8 +6203,9 @@ needs to be inserted at a specific position in the
font-lock sequence.")
;; Apply this last, after all the markup is highlighted, so
;; that even "bright" markup will become dim.
(list (format
- "^\\*+\\(?: +%s\\)?\\(?: +\\[#[A-Z0-9]\\]\\)?
+\\(?9:%s\\)\\(?: \\|$\\)"
+ "^\\*+\\(?: +%s\\)?\\(?: +\\[#\\(?:%s\\)\\]\\)?
+\\(?9:%s\\)\\(?: \\|$\\)"
org-todo-regexp
+ org-priority-value-regexp
org-comment-string)
'(9 'org-special-keyword prepend))
'(org-activate-folds))))
