branch: elpa/vm
commit 3ea1764efdd871383d16df82407ddad4fde6bee3
Merge: 428acda8862 5a4718bf9a0
Author: Mark Diekhans <[email protected]>
Commit: Mark Diekhans <[email protected]>
Merge branch 'main' into 'main'
Address problem with 8.3.1 change where some user configurations for emacs
30...
See merge request emacs-vm/vm!66
---
NEWS | 8 +++++++-
configure.ac | 2 +-
dev/docs/releasing.org | 2 +-
info/vm.texinfo | 3 ++-
lisp/vm.el | 11 ++++++-----
5 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/NEWS b/NEWS
index cb06d111607..67f6bb6fb43 100644
--- a/NEWS
+++ b/NEWS
@@ -22,7 +22,13 @@ Status
Bug reports (email): [email protected]
(Please use `M-x vm-submit-bug-report' within VM)
-VM 8.3.1 released 2025-12-22
+VM 8.3.2 released 2025-12-29
+
+ CHANGES
+ * Address problem with 8.3.1 change where some user configurations for emacs
30
+ need vm to evaluate autoloads.el.
+
+VM 8.3.1 released 2025-12-27
CHANGES
* Work around ELPA install problem cause by emacs 28 not adding a provide
call when
diff --git a/configure.ac b/configure.ac
index e415eb66710..7304fecc1a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,7 +237,7 @@ TEST
])
##############################################################################
-AC_INIT([VM],[8.3.2snapshot],[[email protected]])
+AC_INIT([VM],[8.3.3snapshot],[[email protected]])
# Name of the application
# Version (release) number
# Contact address
diff --git a/dev/docs/releasing.org b/dev/docs/releasing.org
index 881cb2f3973..c8754cffce4 100644
--- a/dev/docs/releasing.org
+++ b/dev/docs/releasing.org
@@ -28,7 +28,7 @@ note lint will not be clean, due to xemacs references
then merge to make official
* version update in these files:
-- Add note abort release to info/vm.texinfo @item Version ..
+- Add note about release to info/vm.texinfo @item Version ..
- NEWS
- version in configure.ac AC_INIT
- lisp/vm.el Version:
diff --git a/info/vm.texinfo b/info/vm.texinfo
index bbdc56f1302..4faa2957abf 100644
--- a/info/vm.texinfo
+++ b/info/vm.texinfo
@@ -7217,7 +7217,8 @@ Please let us know if any contributors have been missed
out.
@item Version 8.2.0, planned for release in March, 2013.
@item Version 8.3.0, released 22 December 2025
@item Version 8.3.1, released 27 December 2025
-@item Version 8.3.2snapshot, under development
+@item Version 8.3.2, released 29 December 2025
+@item Version 8.3.3snapshot, from git
@end itemize
diff --git a/lisp/vm.el b/lisp/vm.el
index 2ba6154bf9b..cb74ab895f9 100644
--- a/lisp/vm.el
+++ b/lisp/vm.el
@@ -6,7 +6,7 @@
;; Copyright (C) 2003-2006 Robert Widhopf-Fenk
;; Copyright (C) 2024-2025 The VM Developers
;;
-;; Version: 8.3.2.snapshot
+;; Version: 8.3.3snapshot
;; Maintainer: [email protected]
;; URL: https://gitlab.com/emacs-vm/vm
;; Package-Requires: ((emacs "28.1") (vcard "0.2.2"))
@@ -99,10 +99,11 @@
;; 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)))
+(cond ((<= emacs-major-version 28)
+ (progn
+ (load-library "vm-autoloads")
+ (provide 'vm-autoloads)))
+ (t (require 'vm-autoloads)))
;;;###autoload
(cl-defun vm (&optional folder &key read-only interactive
