Re: master 5a125fb5a97 1/2: Update to Org 9.7.3

[Ihor Radchenko <yantar92@posteo.net>]

[-- Attachment #1: Type: text/plain, Size: 1011 bytes --]

Eli Zaretskii <eliz@gnu.org> writes:

>> (defcustom org-num-skip-tags nil
> ...
>>   :safe (lambda (val) (and (listp val) (cl-every #'stringp val))))
>> 
>> Note that org-num.el where `org-num-skip-tags' is defined does have
>> (require 'cl-lib).
>> 
>> IMHO, there is some problem either with loaddefs generation or with the
>> fact that loaddefs file is compiled at all.
>
> No, the problem is that this variable uses cl-lib stuff for safep
> functions.  IMO, this is not a good idea, and the above situation is
> precisely the evidence for that.
>
>> Of course, we can always convert that lambda into a proper function,
>> which will likely get rid of the warning.
>
> Yes, please.  Emacs 28 and later has list-of-strings-p, but if you
> want to support older versions of Emacs, perhaps that's not usable.
> Or maybe we could add that to compat.el.

Org cannot directly use compat.el for now.
I am attaching tentative patch that defines a compatibility alias and
autoloads it.
Is this approach good enough?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org-num-skip-tags-Avoid-using-function-that-is-not-p.patch --]
[-- Type: text/x-patch, Size: 2062 bytes --]

From e70b7ce648aa54d5c6a3c91a2fd9982cd0a6e790 Mon Sep 17 00:00:00 2001
Message-ID: <e70b7ce648aa54d5c6a3c91a2fd9982cd0a6e790.1718283515.git.yantar92@posteo.net>
From: Ihor Radchenko <yantar92@posteo.net>
Date: Thu, 13 Jun 2024 14:53:03 +0200
Subject: [PATCH] org-num-skip-tags: Avoid using function that is not
 pre-loaded in autoloads

* lisp/org-num.el (org-num-skip-tags): Make sure that function used
for :safe `defcustom' slot does not require functions that are not
defined in org-loaddefs.el.  This is because `org-num-skip-tags' is
autoloaded and cannot rely upon requires in org-num.el.  Instead, it
may only use pre-loaded functions and other autoloaded Org mode
functions.

Reported-by: Eli Zaretskii <eliz@gnu.org>
Link: https://yhetil.org/emacs-devel/868qzd9hjg.fsf@gnu.org/
---
 lisp/org-compat.el | 11 +++++++++++
 lisp/org-num.el    |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index d6620f962..41c26ad72 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -251,6 +251,17 @@   (defun org-format-prompt (prompt default &rest format-args)
                     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)))
+
 \f
 ;;; Emacs < 27.1 compatibility
 
diff --git a/lisp/org-num.el b/lisp/org-num.el
index aebfef050..a8fcf3333 100644
--- a/lisp/org-num.el
+++ b/lisp/org-num.el
@@ -144,7 +144,7 @@ (defcustom org-num-skip-tags nil
   :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
-- 
2.45.1


[-- Attachment #3: Type: text/plain, Size: 224 bytes --]


-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>