branch: externals/org
commit c2627ae27376df305bff032f2af85da22db10aaf
Merge: 5e17097099 d2e8100b2d
Author: Ihor Radchenko <yanta...@posteo.net>
Commit: Ihor Radchenko <yanta...@posteo.net>
Merge branch 'bugfix'
---
lisp/org-table.el | 10 +++++-----
lisp/org.el | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 21fadd7873..39115bb5f5 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -344,11 +344,11 @@ The `U' flag in a table formula will select this specific
format for
a single formula."
:group 'org-table-calculation
:version "24.1"
- :type '(choice (symbol :tag "Seconds" 'seconds)
- (symbol :tag "Minutes" 'minutes)
- (symbol :tag "Hours " 'hours)
- (symbol :tag "Days " 'days)
- (symbol :tag "HH:MM " 'hh:mm)))
+ :type '(choice (symbol :tag "Seconds" seconds)
+ (symbol :tag "Minutes" minutes)
+ (symbol :tag "Hours " hours)
+ (symbol :tag "Days " days)
+ (symbol :tag "HH:MM " hh:mm)))
(defcustom org-table-duration-hour-zero-padding t
"Non-nil means hours in table duration computations should be zero-padded.
diff --git a/lisp/org.el b/lisp/org.el
index 2e82b6e187..d012819a9c 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -8653,7 +8653,7 @@ When point is a footnote definition, move to the first
reference
found. If it is on a reference, move to the associated
definition.
-When point is on a src-block of inline src-block, open its result.
+When point is on a src-block or inline src-block, open its result.
When point is on a citation, follow it.
