branch: elpa/vm
commit 493fa2cfd41dc82b9db5711b9c8228c4ec88b9f4
Merge: f9105cc8333 107fa65ad76
Author: Mark Diekhans <[email protected]>
Commit: Mark Diekhans <[email protected]>
Merge branch 'main' into 'main'
VM 8.3.0 release
See merge request emacs-vm/vm!63
---
Makefile.in | 20 ++++++++++---
NEWS | 6 ++--
configure.ac | 9 ++----
dev/docs/releasing.org | 23 ++++++++++++++-
info/Makefile.in | 36 +++++++----------------
info/vm.texinfo | 2 +-
lisp/Makefile.in | 79 ++++++++++++++------------------------------------
lisp/vm.el | 28 +-----------------
pixmaps/Makefile.in | 44 +++++++++++++++++++++-------
9 files changed, 111 insertions(+), 136 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index f85d73dc8b5..452cbb4baac 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,6 +3,7 @@
# location of required programms
GIT = git
MKDIR = @MKDIR@
+RMDIR = @RMDIR@
TAR = @TAR@
RM = @RM@
XARGS = @XARGS@
@@ -14,6 +15,7 @@ EMACS_PROG = @EMACS_PROG@
prefix = @prefix@
srcdir = @srcdir@
datarootdir = @datarootdir@
+etcdir = @etcdir@
docdir = @docdir@
SUBDIRS = lisp info pixmaps
@@ -43,7 +45,7 @@ Makefile: @srcdir@/Makefile.in config.status
./config.status $@
@srcdir@/configure: @srcdir@/configure.ac
- cd @srcdir@ ; autoconf
+ cd @srcdir@ && autoconf
./config.status --recheck
config.status: @srcdir@/configure
@@ -53,12 +55,22 @@ install: install-pkg
@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i install) || exit 1; done
install-pkg:
- $(MKDIR) -p "$(DESTDIR)$(docdir)"
+ @$(MKDIR) -p "$(DESTDIR)$(docdir)"
for i in $(SOURCES) ; do \
echo "Installing $$i in '$(DESTDIR)$(docdir)'" ; \
$(INSTALL_DATA) $$i "$(DESTDIR)$(docdir)" ; \
done ;
+uninstall: uninstall-pkg
+ @for i in $(SUBDIRS) ; do ($(MAKE) -C $$i uninstall) || exit 1; done
+ -$(RMDIR) $(DESTDIR)$(docdir)/ 2> /dev/null
+
+uninstall-pkg:
+ @for i in $(SOURCES) ; do \
+ echo "Uninstalling $$i from '$(DESTDIR)$(docdir)'" ; \
+ $(RM) -f "$(DESTDIR)$(docdir)/$$i" ; \
+ done ;
+
clean:
@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i clean) || exit 1; done
@@ -138,8 +150,8 @@ xemacs-package:
echo " :type 'regular)" >> $(PKGINFO)
mkdir $(PKGDIR)/pkginfo;
touch $(PKGDIR)/pkginfo/MANIFEST.vm;
- cd $(PKGDIR); find -type f | cut -c3- > pkginfo/MANIFEST.vm
- cd ,,package; $(TAR) -cvzf ../vm-pkg.tar.gz *
+ cd $(PKGDIR) && find -type f | cut -c3- > pkginfo/MANIFEST.vm
+ cd ,,package && $(TAR) -cvzf ../vm-pkg.tar.gz *
##############################################################################
tags::
diff --git a/NEWS b/NEWS
index a7ee3afddd2..8c8f2d27fab 100644
--- a/NEWS
+++ b/NEWS
@@ -17,12 +17,12 @@ Status
Mailing list: [email protected]
Bug reports (direct): https://gitlab.com/emacs-vm/vm/-/issues/
- (this the preferred mentod)
+ (this the preferred method)
Bug reports (email): [email protected]
(Please use `M-x vm-submit-bug-report' within VM)
-VM 8.3.0 (pending)
+VM 8.3.0 released 2025-12-22
CHANGES
* VM development convert from bzr to git and moved to GitLab.
@@ -30,7 +30,7 @@ VM 8.3.0 (pending)
* Update to modern e-lisp.
* Added vm-version-commit variable and function for the git commit id.
* Remove outdated copy of vcard support in favor of standard package, which
must
- me install for vcard functionality to work
+ be install for vcard functionality to work
* Enable vm-mail-check-recipient-format by default
* Multiple bug fixes
diff --git a/configure.ac b/configure.ac
index 43b06c325cd..385af94a0f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,7 +237,7 @@ TEST
])
##############################################################################
-AC_INIT([VM],[8.3.0snapshot],[[email protected]])
+AC_INIT([VM],[8.3.1snapshot],[[email protected]])
# Name of the application
# Version (release) number
# Contact address
@@ -254,6 +254,7 @@ AC_PROG_LN_S
AC_PATH_PROG(RM, rm, /bin/rm)
AC_PATH_PROG(LS, ls, /bin/ls)
AC_PATH_PROG(MKDIR, mkdir, /bin/mkdir)
+AC_PATH_PROG(RMDIR, rmdir, /bin/rmdir)
AC_PATH_PROG(GREP, grep, /bin/grep)
# External programs checking:
@@ -271,12 +272,6 @@ VM_OTHERDIRS
VM_ARG_SUBST([PACKAGEDIR], [package-dir], [DIR],
[set the Emacs package directory to DIR],)
-VM_ARG_SUBST([SYMLINKS], [symlinks], [],
- [install VM by linking instead of copying], [no])
-
-VM_ARG_SUBST([LINKPATH], [linkpath], [PATH],
- [path to symlink from if `pwd' does not work])
-
AC_OUTPUT
# configure.ac ends here
diff --git a/dev/docs/releasing.org b/dev/docs/releasing.org
index e0369be3de5..8f9b54067a0 100644
--- a/dev/docs/releasing.org
+++ b/dev/docs/releasing.org
@@ -1,5 +1,22 @@
Releasing VM
+* NonGNU ELPA
+
+Package contents of GitLab vm/main will be at NonGNU-devel in
+https://elpa.nongnu.org/nongnu-devel/vm.html
+
+You can test installed by from here using:
+
+(add-to-list 'package-archives
+ '("nongnu-devel" . "https://elpa.nongnu.org/nongnu-devel/";))
+
+Note that it takes around 12 hours for an update to be available on
+NonGNU-devel.
+
+Once release is made with a release version number (1.2.3)
+in vm.el, it will become available as a NonGNU ELPA
+package at https://elpa.nongnu.org/nongnu/vm.html
+
* use package-lint to check vm.el packages
requires package-lint
make package-lint
@@ -11,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 release to info/vm.texinfo @item Version ..
+- Add note abourt release to info/vm.texinfo @item Version ..
- NEWS
- version in configure.ac AC_INIT
- lisp/vm.el Version:
@@ -23,10 +40,14 @@ then merge to make official
- make
* pre-release testing from repo:
+changes must be committed
+
(package-vc-install
'(vm :url "file:////Users/markd/projs/emacs/vm/vm-markd"
:lisp-dir "lisp"))
+Note: as of emacs 30.2, package-vc-install doesn't generate
+a correct description or commit.
* commit and tag
- tag is in the form '3.0.0'
diff --git a/info/Makefile.in b/info/Makefile.in
index 9f7d0d41142..a6fb8b96bcc 100644
--- a/info/Makefile.in
+++ b/info/Makefile.in
@@ -10,6 +10,7 @@ GIT_DIR = "@top_srcdir@/.git"
##############################################################################
# location of required programms
MKDIR = @MKDIR@
+RMDIR = @RMDIR@
RM = @RM@
LS = @LS@
XARGS = @XARGS@
@@ -28,9 +29,6 @@ EMACS_FLAVOR = @EMACS_FLAVOR@
FLAGS = @FLAGS@
-SYMLINKS = @SYMLINKS@
-LINKPATH = @LINKPATH@
-
##############################################################################
all: info
@@ -52,34 +50,22 @@ vm-pcrisis.info:: version.texinfo
info: vm.info vm-pcrisis.info
Makefile: @srcdir@/Makefile.in
- cd @srcdir@/..; ./config.status
+ cd @srcdir@/.. && ./config.status
install: install-pkg
+uninstall: uninstall-pkg
install-pkg: uninstall-pkg info
- @mkdir -p -m 0755 "$(DESTDIR)$(infodir)"; \
- if test "x$(SYMLINKS)" = "xno" ; then \
- for i in `${LS} *.info* ` ; do \
- echo "Installing $$i in $(DESTDIR)$(infodir)" ; \
- $(INSTALL_DATA) $$i "$(DESTDIR)$(infodir)" ; \
- done ; \
- else \
- if test "x$(LINKPATH)" = "x" ; then \
- for i in `${LS} *.info* ` ; do \
- echo "Linking $$i in $(DESTDIR)$(infodir)" ; \
- $(LN_S) "`pwd`/$$i" "$(DESTDIR)$(infodir)/$$i" ; \
- done ; \
- else \
- for i in `${LS} *.info* ` ; do \
- echo "Linking $(LINKPATH)/texinfo/$$i in $(DESTDIR)$(infodir)" ;
\
- $(LN_S) "$(LINKPATH)/texinfo/$$i" "$(DESTDIR)$(infodir)/$$i" ; \
- done ; \
- fi ; \
- fi
- @echo VM INFO files successfully installed\!
+ @$(MKDIR) -p -m 0755 "$(DESTDIR)$(infodir)"; \
+ for i in `${LS} *.info* ` ; do \
+ echo "Installing $$i in $(DESTDIR)$(infodir)" ; \
+ $(INSTALL_DATA) $$i "$(DESTDIR)$(infodir)" ; \
+ done
+ @echo VM INFO files successfully installed
uninstall-pkg:
- -$(RM) "$(DESTDIR)$(infodir)"/vm*.info*
+ -$(RM) -f "$(DESTDIR)$(infodir)"/vm*.info*
+ -$(RMDIR) $(DESTDIR)$(infodir)/ 2> /dev/null
##############################################################################
clean:
diff --git a/info/vm.texinfo b/info/vm.texinfo
index 2b257927e1f..13d23dd9038 100644
--- a/info/vm.texinfo
+++ b/info/vm.texinfo
@@ -7215,7 +7215,7 @@ Please let us know if any contributors have been missed
out.
@item Version 8.1.1, released 25 April, 2010.
@item Version 8.1.2, released 5 March, 2012.
@item Version 8.2.0, planned for release in March, 2013.
-@item Version 8.3.0snapshot, coming soon
+@item Version 8.3.0, released 22 December 2025
@end itemize
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index bfb92a7f478..6eebed70d59 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -87,6 +87,8 @@ AUTOLOAD_FILE = (setq generated-autoload-file
\"./auto-autoloads.el\")
# location of required programms
RM = @RM@
LS = @LS@
+MKDIR = @MKDIR@
+RMDIR = @RMDIR@
XARGS = @XARGS@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -109,9 +111,6 @@ FLAGS = @FLAGS@
EMACS_COMP = OTHERDIRS=@OTHERDIRS@ "$(EMACS_PROG)" $(FLAGS)
-SYMLINKS = @SYMLINKS@
-LINKPATH = @LINKPATH@
-
.el.elc:
$(EMACS_COMP) -f batch-byte-compile $<
@@ -120,7 +119,9 @@ all: $(OBJECTS)
$(OBJECTS): $(AUTOLOADS)
-install: install-el install-elc
+install: install-pkg
+
+uninstall: uninstall-pkg
##############################################################################
# Create file with version and commit
@@ -146,7 +147,7 @@ vm-version-conf.el: Makefile
vm-autoloads.el: $(SOURCES:%=@srcdir@/%)
-$(RM) -f $@
echo > [email protected]
- (build_dir="`pwd`"; cd "@srcdir@"; \
+ (build_dir="`pwd`"; cd "@srcdir@" && \
$(EMACS_COMP) -l autoload \
-f vm-built-autoloads "@abs_builddir@/[email protected]" "`pwd`")
echo "(custom-add-load 'vm 'vm-cus-load)" | tr -d '\015' >> [email protected]
@@ -160,10 +161,6 @@ vm-autoloads.el: $(SOURCES:%=@srcdir@/%)
vm-cus-load.el: $(SOURCES:%=@srcdir@/%)
$(EMACS_COMP) -f vm-custom-make-dependencies .
- if [ "@EMACS_VERSION" = "21" ] ; then \
- sed -e "s/provide 'cus-load/provide 'vm-cus-load/" cus-load.el > $@
;\
- $(RM) cus-load.el ;\
- fi
##############################################################################
# XEmacs#s auto-autoloads and custom-load file
@@ -191,57 +188,25 @@ custom-load.el: $(SOURCES:%=@srcdir@/%)
##############################################################################
install-pkg: all $(INSTALL_FILES)
- @if test "x$(SYMLINKS)" = "xno" ; then \
- mkdir -p -m 0755 $(DESTDIR)$(PACKAGEDIR); \
- for i in $(SOURCES:%=@srcdir@/%) $(INSTALL_FILES) ; do \
- echo "Installing $$i in $(DESTDIR)$(PACKAGEDIR)" ; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(PACKAGEDIR) ; \
- done ; \
- else \
- if test "x$(LINKPATH)" = "x" ; then \
- $(LN_S) "`pwd`" $(DESTDIR)$(PACKAGEDIR) ; \
- else \
- $(LN_S) $(LINKPATH)/lisp $(DESTDIR)$(PACKAGEDIR) ; \
- fi ; \
- fi
- @echo VM ELISP files successfully installed\!
-
-# This entry will never install .el files if there are no .elc files.
-install-el: all $(INSTALL_FILES)
- $(INSTALL) -d -m 0755 "$(DESTDIR)$(lispdir)/"
- for elc in *.elc; do \
- el=`basename $$elc c`; \
- if test -f "$(srcdir)/$$el"; then \
- echo "Install $$el in $(DESTDIR)$(lispdir)/"; \
- $(INSTALL_DATA) "${srcdir}/$$el" "$(DESTDIR)$(lispdir)/"; \
- fi; \
- done;
- if $(LS) $(contrib)/*.elc > /dev/null 2>&1; then \
- for elc in $(contribdir)/*.elc; do \
- el=`basename $$elc c`; \
- if test -f "${srcdir}/$(contribdir)/$$el"; then \
- echo "Install $(contribdir)/$$el in $(DESTDIR)$(lispdir)/";
\
- $(INSTALL_DATA) "${srcdir}/$(contribdir)/$$el"
"$(DESTDIR)$(lispdir)/"; \
- fi; \
- done; \
- fi;
-
-install-elc: all $(INSTALL_FILES)
- $(INSTALL) -d -m 0755 "$(DESTDIR)$(lispdir)/"
- for elc in *.elc; do \
- echo "Install $$elc in $(DESTDIR)$(lispdir)/"; \
- $(INSTALL_DATA) $$elc "$(DESTDIR)$(lispdir)/"; \
- done;
- if $(LS) $(contribdir)/*.elc > /dev/null 2>&1; then \
- for elc in $(contribdir)/*.elc; do \
- echo "Install $$elc in $(DESTDIR)$(lispdir)"; \
- $(INSTALL_DATA) $$elc "$(DESTDIR)$(lispdir)"; \
- done; \
- fi;
+ @mkdir -p -m 0755 $(DESTDIR)$(lispdir); \
+ for i in $(SOURCES:%=@srcdir@/%) $(INSTALL_FILES) ; do \
+ echo "Installing $$i in $(DESTDIR)$(lispdir)" ; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(lispdir) ; \
+ done
+ @echo VM ELISP files successfully installed
+
+uninstall-pkg: $(INSTALL_FILES)
+ @for i in $(SOURCES:%=@srcdir@/%) $(INSTALL_FILES) ; do \
+ echo "Unnstalling $$i from $(DESTDIR)$(lispdir)" ; \
+ $(RM) -f $(DESTDIR)$(lispdir)/$$i ; \
+ done
+ -$(RMDIR) $(DESTDIR)$(lispdir)/ 2> /dev/null
+ @echo VM ELISP files successfully uninstalled
+
##############################################################################
Makefile: @srcdir@/Makefile.in
- cd .. ; ./config.status
+ cd @srcdir@/.. && ./config.status
##############################################################################
clean:
diff --git a/lisp/vm.el b/lisp/vm.el
index 0bd0b6232e3..e50901d79d9 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.0snapshot
+;; Version: 8.3.1snapshot
;; Maintainer: [email protected]
;; URL: https://gitlab.com/emacs-vm/vm
;; Package-Requires: ((emacs "28.1") (vcard "0.2.2"))
@@ -1549,30 +1549,6 @@ summary buffer to select a folder."
(interactive)
(find-file-other-frame vm-init-file))
-(defun vm-check-emacs-version ()
- "Checks the version of Emacs and gives an error if it is unsupported."
- (cond ((and (featurep 'xemacs) (< emacs-major-version 21))
- (error "VM %s must be run on XEmacs 21 or a later version."
- (vm-version)))
- ((and (not (featurep 'xemacs)) (< emacs-major-version 21))
- (error "VM %s must be run on GNU Emacs 21 or a later version."
- (vm-version)))))
-
-;; This function is now defunct. USR, 2011-11-12
-
-;; (defun vm-set-debug-flags ()
-;; (or stack-trace-on-error
-;; debug-on-error
-;; (setq stack-trace-on-error
-;; '(
-;; wrong-type-argument
-;; wrong-number-of-arguments
-;; args-out-of-range
-;; void-function
-;; void-variable
-;; invalid-function
-;; ))))
-
(defun vm-toggle-thread-operations ()
"Toggle the variable `vm-enable-thread-operations'.
@@ -1614,11 +1590,9 @@ attributes, adding/deleting labels etc."
"If this is the first time VM has been run in this Emacs session,
do some necessary preparations. Otherwise, update the count of
draft messages."
- ;; (vm-set-debug-flags)
(if (or (not (boundp 'vm-session-beginning))
vm-session-beginning)
(progn
- (vm-check-emacs-version)
(require 'vm-macro)
(require 'vm-vars)
(require 'vm-misc)
diff --git a/pixmaps/Makefile.in b/pixmaps/Makefile.in
index 78a6017fec3..0d16075a41d 100644
--- a/pixmaps/Makefile.in
+++ b/pixmaps/Makefile.in
@@ -6,6 +6,7 @@ SHELL = /bin/sh
##############################################################################
# location of required programms
MKDIR = @MKDIR@
+RMDIR = @RMDIR@
RM = @RM@
LS = @LS@
INSTALL = @INSTALL@
@@ -15,35 +16,56 @@ prefix = @prefix@
srcdir = @srcdir@
pixmapdir = @pixmapdir@
-SYMLINKS = @SYMLINKS@
-LINKPATH = @LINKPATH@
-
##############################################################################
all:
Makefile: @srcdir@/Makefile.in
- cd @srcdir@/..; ./config.status
+ cd @srcdir@/.. && ./config.status
install: install-pkg
+uninstall: uninstall-pkg
+
+
+##############################################################################
install-pkg:
$(MKDIR) -p "$(DESTDIR)$(pixmapdir)"
- for i in `$(LS) *.xpm` ; do \
+ @for i in *.xpm ; do \
echo "Installing $$i in '$(DESTDIR)$(pixmapdir)'" ; \
$(INSTALL_DATA) $$i "$(DESTDIR)$(pixmapdir)" ; \
- done ;
+ done
$(MKDIR) -p "$(DESTDIR)$(pixmapdir)/mime"
- for i in `ls mime/*.xpm` ; do \
+ @for i in mime/*.xpm ; do \
echo "Installing $$i in '$(DESTDIR)$(pixmapdir)'" ; \
$(INSTALL_DATA) $$i "$(DESTDIR)$(pixmapdir)/mime" ; \
- done ;
+ done
$(MKDIR) -p "$(DESTDIR)$(pixmapdir)/gtk"
- for i in `ls gtk/*.xpm` ; do \
+ @for i in gtk/*.xpm ; do \
echo "Installing $$i in '$(DESTDIR)$(pixmapdir)'" ; \
$(INSTALL_DATA) $$i "$(DESTDIR)$(pixmapdir)/gtk" ; \
- done ;
- @echo VM pixmaps successfully installed\!
+ done
+ @echo VM pixmaps successfully installed
+
+##############################################################################
+uninstall-pkg:
+ @for i in mime/*.xpm ; do \
+ echo "Uninstalling $$i from '$(DESTDIR)$(pixmapdir)'" ; \
+ rm -f "$(DESTDIR)$(pixmapdir)/$$i" ; \
+ done
+ -$(RMDIR) "$(DESTDIR)$(pixmapdir)/mime" 2> /dev/null
+ @for i in gtk/*.xpm ; do \
+ echo "Uninstalling $$i from '$(DESTDIR)$(pixmapdir)'" ; \
+ rm -f "$(DESTDIR)$(pixmapdir)/$$i" ; \
+ done
+ -$(RMDIR) "$(DESTDIR)$(pixmapdir)/gtk" 2> /dev/null
+ @for i in *.xpm ; do \
+ echo "Uninstalling $$i from '$(DESTDIR)$(pixmapdir)'" ; \
+ rm -f "$(DESTDIR)$(pixmapdir)/$$i" ; \
+ done
+ -$(RMDIR) "$(DESTDIR)$(pixmapdir)/" 2> /dev/null
+ @echo VM pixmaps successfully uninstalled
+
##############################################################################
clean:
