branch: elpa/emacsql
commit f177a41e93b92a4b1139a553eed5415ca33f439c
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
make: Add check-declare as a dependency of lisp
---
Makefile | 2 +-
emacsql-pg.el | 8 ++++----
emacsql-sqlite-module.el | 8 +++++---
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index cd7a5628263..1415112ab4c 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ help:
@printf "\n"
redo: clean lisp
-lisp: $(ELCS) autoloads
+lisp: $(ELCS) autoloads check-declare
autoloads: $(PKG)-autoloads.el
diff --git a/emacsql-pg.el b/emacsql-pg.el
index d15ed597bf5..649423f267e 100644
--- a/emacsql-pg.el
+++ b/emacsql-pg.el
@@ -22,12 +22,12 @@
(if (>= emacs-major-version 28)
(require 'pg nil t)
(message "emacsql-pg.el requires Emacs 28.1 or later"))
-(declare-function pg-connect "pg"
+(declare-function pg-connect "ext:pg"
( dbname user &optional
(password "") (host "localhost") (port 5432) (tls nil)))
-(declare-function pg-disconnect "pg" (con))
-(declare-function pg-exec "pg" (connection &rest args))
-(declare-function pg-result "pg" (result what &rest arg))
+(declare-function pg-disconnect "ext:pg" (con))
+(declare-function pg-exec "ext:pg" (connection &rest args))
+(declare-function pg-result "ext:pg" (result what &rest arg))
(defclass emacsql-pg-connection (emacsql-connection)
((pgcon :reader emacsql-pg-pgcon :initarg :pgcon)
diff --git a/emacsql-sqlite-module.el b/emacsql-sqlite-module.el
index 413a62605bd..be91b6bdd30 100644
--- a/emacsql-sqlite-module.el
+++ b/emacsql-sqlite-module.el
@@ -17,9 +17,11 @@
(require 'emacsql-sqlite)
(require 'sqlite3 nil t)
-(declare-function sqlite3-open "ext:sqlite3-api")
-(declare-function sqlite3-exec "ext:sqlite3-api")
-(declare-function sqlite3-close "ext:sqlite3-api")
+;; Prevent check-declare from finding the defining file but then making
+;; noise because it fails to find the definition because it is a module.
+(declare-function sqlite3-open "ext:module:sqlite3-api")
+(declare-function sqlite3-exec "ext:module:sqlite3-api")
+(declare-function sqlite3-close "ext:module:sqlite3-api")
(defvar sqlite-open-readwrite)
(defvar sqlite-open-create)