Re: master 3abb3681b5: Use org-time-convert-to-integer instead of by hand

[Paul Eggert <eggert@cs.ucla.edu>]

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

On 4/27/22 04:24, Lars Ingebrigtsen wrote:
> org/org-macs.el:267:27: Warning: the function `org-time-convert-to-integer' is not known to be defined.

Thanks for catching that. I installed the attached.

[-- Attachment #2: 0001-Pacify-byte-compiler-etc.-on-org-compat-org-macs.patch --]
[-- Type: text/x-patch, Size: 2301 bytes --]

From 201c06e68639ce9704280250bf0c14ea802f3551 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 28 Apr 2022 13:40:13 -0700
Subject: [PATCH] Pacify byte compiler etc. on org-compat, org-macs

Byte-compiler problem reported by Lars Ingebrigtsen in:
https://lists.gnu.org/r/emacs-devel/2022-04/msg01256.html
* lisp/org/org-compat.el (org-at-table.el-p):
Now declared in org-table, not org.
(org-string-collate-lessp): Define the ersatz
org-string-collate-lessp with the same API as the primary form, to
pacify check-declare-file when run on org-macs.
* lisp/org/org-macs.el (org-time-convert-to-integer): Declare.
---
 lisp/org/org-compat.el | 4 ++--
 lisp/org/org-macs.el   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index 7ac07ce4f6..3e394fbab1 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -39,7 +39,7 @@
 (declare-function org-calendar-goto-agenda "org-agenda" ())
 (declare-function org-align-tags "org" (&optional all))
 (declare-function org-at-heading-p "org" (&optional ignored))
-(declare-function org-at-table.el-p "org" ())
+(declare-function org-at-table.el-p "org-table" ())
 (declare-function org-element-at-point "org-element" ())
 (declare-function org-element-context "org-element" (&optional element))
 (declare-function org-element-lineage "org-element" (blob &optional types with-self))
@@ -238,7 +238,7 @@ 'org-babel-edit-distance
 (if (fboundp 'string-collate-lessp)
     (defalias 'org-string-collate-lessp
       'string-collate-lessp)
-  (defun org-string-collate-lessp (s1 s2 &rest _)
+  (defun org-string-collate-lessp (s1 s2 &optional _ _)
     "Return non-nil if STRING1 is less than STRING2 in lexicographic order.
 Case is significant."
     (string< s1 s2)))
diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index 92591b5bb7..bb0562dde0 100644
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -37,6 +37,7 @@
 (declare-function org-mode "org" ())
 (declare-function org-show-context "org" (&optional key))
 (declare-function org-string-collate-lessp "org-compat" (s1 s2 &optional locale ignore-case))
+(declare-function org-time-convert-to-integer "org-compat" (time))
 
 (defvar org-ts-regexp0)
 (defvar ffap-url-regexp)
-- 
2.35.1