branch: externals/org
commit 3e4588c732324c8bba7615c50bdeda4488f18e91
Merge: 1686b6f3ba bd8b861ee9
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Merge branch 'bugfix'
---
lisp/org-capture.el | 7 +++----
lisp/org-compat.el | 11 +++++++++++
lisp/org-num.el | 2 +-
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 786b81771c..98a43b0962 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -410,8 +410,7 @@ you can escape ambiguous cases with a backward slash, e.g.,
\\%i."
(let ((file-variants '(choice :tag "Filename "
(file :tag "Literal")
(function :tag "Function")
- (variable :tag "Variable")
- (sexp :tag "Form"))))
+ (variable :tag "Variable"))))
`(repeat
(choice :value ("" "" entry (file "~/org/notes.org") "")
(list :tag "Multikey description"
@@ -454,12 +453,12 @@ you can escape ambiguous cases with a backward slash,
e.g., \\%i."
(list :tag "File & function"
(const :format "" file+function)
,file-variants
- (sexp :tag " Function"))
+ (function :tag " Function"))
(list :tag "Current clocking task"
(const :format "" clock))
(list :tag "Function"
(const :format "" function)
- (sexp :tag " Function")))
+ (function :tag " Function")))
(choice :tag "Template "
(string)
(list :tag "File"
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index d6620f9627..41c26ad72f 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -251,6 +251,17 @@ removed."
default)))
": ")))
+(if (fboundp 'list-of-strings-p)
+ (defalias 'org-list-of-strings-p #'list-of-strings-p)
+ ;; From Emacs subr.el.
+;;;###autoload
+ (defun org-list-of-strings-p (object)
+ "Return t if OBJECT is nil or a list of strings."
+ (declare (pure t) (side-effect-free error-free))
+ (while (and (consp object) (stringp (car object)))
+ (setq object (cdr object)))
+ (null object)))
+
;;; Emacs < 27.1 compatibility
diff --git a/lisp/org-num.el b/lisp/org-num.el
index aebfef0507..a8fcf33336 100644
--- a/lisp/org-num.el
+++ b/lisp/org-num.el
@@ -144,7 +144,7 @@ control tag inheritance."
:group 'org-appearance
:package-version '(Org . "9.3")
:type '(repeat (string :tag "Tag"))
- :safe (lambda (val) (and (listp val) (cl-every #'stringp val))))
+ :safe #'org-list-of-strings-p)
;;;###autoload
(defcustom org-num-skip-unnumbered nil
