branch: externals/org
commit 72db4de02d0080d78a5b4dda137ffdb1b1e7140f
Merge: f7238772eb 326ca3d139
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Merge branch 'bugfix'
---
doc/org-guide.org | 7 ++++---
doc/org-manual.org | 12 ++++++------
testing/lisp/test-ob.el | 24 ++++++++++++------------
testing/lisp/test-org-capture.el | 6 +++---
testing/lisp/test-org.el | 1 -
5 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/doc/org-guide.org b/doc/org-guide.org
index 5e59fb0258..0db9ff5896 100644
--- a/doc/org-guide.org
+++ b/doc/org-guide.org
@@ -886,9 +886,10 @@ mode has extensive support for tags.
Every headline can contain a list of tags; they occur at the end of
the headline. Tags are normal words containing letters, numbers, =_=,
-and =@=. Tags must be preceded and followed by a single colon, e.g.,
-=:work:=. Several tags can be specified, as in =:work:urgent:=. Tags
-by default are in bold face with the same color as the headline.
+=@=, =#=, and =%=. Tags must be preceded and followed by a single
+colon, e.g., =:work:=. Several tags can be specified, as in
+=:work:urgent:=. Tags by default are in bold face with the same color
+as the headline.
** Tag inheritance
:PROPERTIES:
diff --git a/doc/org-manual.org b/doc/org-manual.org
index d69093441c..89fe6b392e 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -4918,12 +4918,12 @@ mode has extensive support for tags.
#+vindex: org-tag-faces
Every headline can contain a list of tags; they occur at the end of
the headline. Tags are normal words containing letters, numbers, =_=,
-and =@=. Tags must be preceded and followed by a single colon, e.g.,
-=:work:=. Several tags can be specified, as in =:work:urgent:=. Tags
-by default are in bold face with the same color as the headline. You
-may specify special faces for specific tags using the variable
-~org-tag-faces~, in much the same way as you can for TODO keywords
-(see [[*Faces for TODO keywords]]).
+=@=, =#=, and =%=. Tags must be preceded and followed by a single
+colon, e.g., =:work:=. Several tags can be specified, as in
+=:work:urgent:=. Tags by default are in bold face with the same color
+as the headline. You may specify special faces for specific tags
+using the variable ~org-tag-faces~, in much the same way as you can
+for TODO keywords (see [[*Faces for TODO keywords]]).
** Tag Inheritance
:PROPERTIES:
diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el
index a75e5fa729..694a37a3a8 100644
--- a/testing/lisp/test-ob.el
+++ b/testing/lisp/test-ob.el
@@ -363,19 +363,19 @@ at the beginning of a line."
test-line
(goto-char (point-min)) (org-babel-execute-maybe)
(should (string=
- (concat test-line " {{{results(=1=)}}}")
- (buffer-substring-no-properties
(line-beginning-position) (line-end-position))))
+ (concat test-line " {{{results(=1=)}}}")
+ (buffer-substring-no-properties (line-beginning-position)
(line-end-position))))
(forward-char) (org-babel-execute-maybe)
(should (string=
- (concat test-line " {{{results(=1=)}}}")
- (buffer-substring-no-properties
(line-beginning-position) (line-end-position))))
+ (concat test-line " {{{results(=1=)}}}")
+ (buffer-substring-no-properties (line-beginning-position)
(line-end-position))))
(re-search-forward "{{{")
- ;;(should-error (org-ctrl-c-ctrl-c))
+ ;;(should-error (org-ctrl-c-ctrl-c))
(backward-char 4) ;; last char of block body
(org-babel-execute-maybe)
(should (string=
- (concat test-line " {{{results(=1=)}}}")
- (buffer-substring-no-properties
(line-beginning-position) (line-end-position)))))
+ (concat test-line " {{{results(=1=)}}}")
+ (buffer-substring-no-properties (line-beginning-position)
(line-end-position)))))
;; src_ follows space line 1...
(let ((test-line " src_emacs-lisp{ 1 }"))
(org-test-with-temp-text
@@ -465,7 +465,7 @@ at the beginning of a line."
(should-error (org-ctrl-c-ctrl-c))
(forward-char) (org-babel-execute-maybe)
(should (string=
- (concat test-line " {{{results(=x=)}}}")
+ (concat test-line " {{{results(=x=)}}}")
(buffer-substring-no-properties
(line-beginning-position) (line-end-position))))))
(let ((test-line (concat " Some text prior to block "
@@ -476,12 +476,12 @@ at the beginning of a line."
(insert (concat "\n" test-line " end"))
(re-search-backward "src") (org-babel-execute-maybe)
(should (string=
- (concat test-line " {{{results(=y=)}}} end")
- (buffer-substring-no-properties (line-beginning-position)
(line-end-position))))
+ (concat test-line " {{{results(=y=)}}} end")
+ (buffer-substring-no-properties (line-beginning-position)
(line-end-position))))
(re-search-forward "\" ") (org-babel-execute-maybe)
(should (string=
- (concat test-line " {{{results(=y=)}}} end")
- (buffer-substring-no-properties (line-beginning-position)
(line-end-position))))
+ (concat test-line " {{{results(=y=)}}} end")
+ (buffer-substring-no-properties (line-beginning-position)
(line-end-position))))
(forward-char 3)
(should-error (org-ctrl-c-ctrl-c)))))
diff --git a/testing/lisp/test-org-capture.el b/testing/lisp/test-org-capture.el
index 6b49a2df74..41852a0a01 100644
--- a/testing/lisp/test-org-capture.el
+++ b/testing/lisp/test-org-capture.el
@@ -763,9 +763,9 @@
(let* ((file (buffer-file-name))
(org-blank-before-new-entry
'((plain-list-item . nil)))
- (org-capture-templates
- `(("t" "Test" item (file ,file) "- X"
- :immediate-finish t :empty-lines 1))))
+ (org-capture-templates
+ `(("t" "Test" item (file ,file) "- X"
+ :immediate-finish t :empty-lines 1))))
(org-capture nil "t")
(buffer-string))))))
diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el
index f0aff2287b..e7769ba6c9 100644
--- a/testing/lisp/test-org.el
+++ b/testing/lisp/test-org.el
@@ -10171,4 +10171,3 @@ two
(provide 'test-org)
;;; test-org.el ends here
-
