branch: externals/org
commit 96530b7b46e7fcf438a3c880e7d3d29956ff4c73
Merge: 9a3b22098e 91f3590d79
Author: Ihor Radchenko <yanta...@posteo.net>
Commit: Ihor Radchenko <yanta...@posteo.net>
Merge branch 'bugfix'
---
lisp/org-agenda.el | 8 ++++----
lisp/org-clock.el | 2 +-
lisp/org-table.el | 10 +++++-----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 8143fd97a7..2a09a6a191 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -2829,7 +2829,7 @@ type."
:version "24.4"
:package-version '(Org . "8.0")
:group 'org-agenda-custom-commands
- :type '(choice (symbol :tag "No limit" nil)
+ :type '(choice (const :tag "No limit" nil)
(integer :tag "Max number of entries")
(repeat
(cons (choice :tag "Agenda type"
@@ -2847,7 +2847,7 @@ type."
:version "24.4"
:package-version '(Org . "8.0")
:group 'org-agenda-custom-commands
- :type '(choice (symbol :tag "No limit" nil)
+ :type '(choice (const :tag "No limit" nil)
(integer :tag "Max number of TODOs")
(repeat
(cons (choice :tag "Agenda type"
@@ -2865,7 +2865,7 @@ type."
:version "24.4"
:package-version '(Org . "8.0")
:group 'org-agenda-custom-commands
- :type '(choice (symbol :tag "No limit" nil)
+ :type '(choice (const :tag "No limit" nil)
(integer :tag "Max number of tagged entries")
(repeat
(cons (choice :tag "Agenda type"
@@ -2883,7 +2883,7 @@ to limit entries to in this type."
:version "24.4"
:package-version '(Org . "8.0")
:group 'org-agenda-custom-commands
- :type '(choice (symbol :tag "No limit" nil)
+ :type '(choice (const :tag "No limit" nil)
(integer :tag "Max number of minutes")
(repeat
(cons (choice :tag "Agenda type"
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 5fd0580d05..933c054874 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -144,7 +144,7 @@ out time will be 14:50."
:package-version '(Org . "8.0")
:type '(choice
(integer :tag "Minutes (0 for no rounding)")
- (symbol :tag "Use `org-time-stamp-rounding-minutes'"
'same-as-time-stamp)))
+ (const :tag "Use `org-time-stamp-rounding-minutes'"
same-as-time-stamp)))
(defcustom org-clock-out-remove-zero-time-clocks nil
"Non-nil means remove the clock line when the resulting time is zero."
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 39115bb5f5..0147fe4408 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 (const :tag "Seconds" seconds)
+ (const :tag "Minutes" minutes)
+ (const :tag "Hours " hours)
+ (const :tag "Days " days)
+ (const :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.
