[nongnu] elpa/vm d43393159d3 2/3: Work around ELPA install project causes by emacs 28 not generating provide in autoloads.

[ELPA Syncer]

branch: elpa/vm
commit d43393159d31b25f7f20d33d386aaef781dc80c6
Author: Mark Diekhans <ma...@ucsc.edu>
Commit: Mark Diekhans <ma...@ucsc.edu>

    Work around ELPA install project causes by emacs 28 not generating provide 
in autoloads.
---
 NEWS                |  6 ++++++
 lisp/Makefile.in    |  3 +--
 lisp/vm-autoload.el |  6 ------
 lisp/vm.el          | 13 ++++++++-----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/NEWS b/NEWS
index 8c8f2d27fab..537bda8bab2 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,12 @@ Status
   Bug reports (email):     viewmail-b...@nongnu.org
                            (Please use `M-x vm-submit-bug-report' within VM)
 
+VM 8.3.1
+
+  CHANGES
+  * Work around ELPA install project causes by emacs 28 not generating provide 
in autoloads.
+
+
 VM 8.3.0 released 2025-12-22
 
   CHANGES
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 6eebed70d59..4f5c05747a7 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -10,7 +10,6 @@ GIT_DIR = "@top_srcdir@/.git"
 
 # the list of source files
 SOURCES = vm.el
-SOURCES += vm-autoload.el
 SOURCES += vm-avirtual.el
 SOURCES += vm-biff.el
 SOURCES += vm-crypto.el
@@ -139,7 +138,7 @@ vm-version-conf.el: Makefile
        mv -f $@.tmp $@
 
 #############################################################################
-# GNU Emacs's vm-autoload file
+# GNU Emacs's vm-autoloads file
 # We use tr -d because Emacs under Cygwin apparently outputs CRLF
 # under Windows.  We remove the CRs.
 # Solaris 8's tr -d '\r' removes r's so we use '\015' instead.
diff --git a/lisp/vm-autoload.el b/lisp/vm-autoload.el
deleted file mode 100644
index 10e61ebbf6b..00000000000
--- a/lisp/vm-autoload.el
+++ /dev/null
@@ -1,6 +0,0 @@
-;; only for compatibility with older BBDB and others  -*- lexical-binding: t; 
-*-
-
-(if (not (featurep 'xemacs))
-   (require 'vm-autoloads))
-
-(provide 'vm-autoload)
diff --git a/lisp/vm.el b/lisp/vm.el
index e50901d79d9..d091218672b 100644
--- a/lisp/vm.el
+++ b/lisp/vm.el
@@ -95,11 +95,14 @@
   (error "VM requires Emacs %s or later" vm-min-emacs-version))
 
 
-;; Ensure that vm-autoloads is loaded in case the user is using VM
-;; autoloads 
-
-(if (not (featurep 'xemacs))
-    (require 'vm-autoloads))
+;; emacs 28 doesn't generate a provide in when generating autoloads
+;; yet does bbdb-vm.el  (require 'vm-autoloads). This workds around
+;; this issue, yet allows vm.el to work if evaluated without going through
+;; vm-autoloads.
+(if (<= emacs-major-version 28)
+    (progn
+      (load-library "vm-autoloads")
+      (provide 'vm-autoloads)))
 
 ;;;###autoload
 (cl-defun vm (&optional folder &key read-only interactive