branch: elpa/vm
commit de000a10a266f516eadf27590091277a8e82f48a
Merge: 646d2f8efb6 41d85ec52a1
Author: Mark Diekhans <[email protected]>
Commit: Mark Diekhans <[email protected]>
Merge branch 'main' into 'main'
Warning fixes
See merge request emacs-vm/vm!53
---
info/vm.texinfo | 10 +++++-----
lisp/Makefile.in | 10 ++++++----
lisp/vm-biff.el | 2 +-
lisp/vm-build.el | 2 +-
lisp/vm.el | 19 +++++++++++++++----
5 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/info/vm.texinfo b/info/vm.texinfo
index b5b991e0dad..7ebae96e4c1 100644
--- a/info/vm.texinfo
+++ b/info/vm.texinfo
@@ -24,7 +24,7 @@ This file documents the VM mail reader.
@item Copyright @copyright{} 2003 - 2008 Robert Widhopf-Fenk
@item Copyright @copyright{} 2008 - 2012 Uday S. Reddy
@item Copyright @copyright{} 2024-2025 The VM Developers
-o@end table
+@end table
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@@ -2707,7 +2707,7 @@ any XEmacs version compiled with MULE support, the value
of
because all characters are displayed using fonts discovered by
MULE and VM has no control over them.
-@node multipart/alternative, Inferring @acronym{MIME} types, Character sets,
@acronym{MIME} Messages
+@node multipart/alternative, multipart/related, Character sets, @acronym{MIME}
Messages
@subsection @acronym{MIME} multipart/alternative
@cindex @acronym{MIME} alternatives
@@ -2787,7 +2787,7 @@ You can ask VM to always treat @samp{multipart/related}
content in a way
similar to @samp{multipart/mixed} by setting the variable
@code{vm-mime-multipart/related-show-method} to @code{'mixed}.
-@node Inferring @acronym{MIME} types, Reading Secure @acronym{MIME},
multipart/alternative, @acronym{MIME} Messages
+@node Inferring @acronym{MIME} types, Reading Secure @acronym{MIME},
multipart/related, @acronym{MIME} Messages
@subsection Inferring @acronym{MIME} types
Some mailers incorrectly use the generic
@@ -5188,7 +5188,7 @@ the string. This is more efficient than the
@code{vm-isearch-forward}
command (@pxref{Navigating}) because it only searches in the text part
of message bodies, not inside @acronym{MIME} attachments.
-@node Defined Folders, Working with Virtual Folders, Search Folders, Virtual
Folders
+@node Defined Folders, Virtual Selectors, Search Folders, Virtual Folders
@section Defined Virtual Folders
@vindex vm-virtual-folder-alist
@@ -5531,7 +5531,7 @@ matches the message if the current-buffer is in mail-mode
and one of
its argument selectors matches the message.
@end table
-@node Working with Virtual Folders, vm-avirtual, Defined Folders,Virtual
Folders
+@node Working with Virtual Folders, vm-avirtual, Virtual Selectors, Virtual
Folders
@section Working with Virtual Folders
@findex vm-get-new-mail
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 7f25391d990..bfb92a7f478 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -125,13 +125,15 @@ install: install-el install-elc
##############################################################################
# Create file with version and commit
vm-version-conf.el: Makefile
- echo ";;; Generated file do not commit " > [email protected]
- echo '(defconst vm-version-config "'"$(PACKAGE_VERSION)"'")' >> [email protected]
+ echo ";;; Generated file do not commit -*- lexical-binding: t; -*-" >
[email protected]
+ echo '(defvar vm-version-config)' >> [email protected]
+ echo '(defvar vm-version-commit-config)' >> [email protected]
+ echo '(setq vm-version-config "$(PACKAGE_VERSION)")' >> [email protected]
if [ -d "$(GIT_DIR)" ]; then \
commit=`$(GIT) --git-dir="$(GIT_DIR)" rev-parse HEAD`; \
- echo '(defconst vm-version-commit-config "'"$${commit}"'")' >>
[email protected] ; \
+ echo '(setq vm-version-commit-config "'"$${commit}"'")' >>
[email protected] ; \
else \
- echo '(defconst vm-version-commit-config "unknown")' >> [email protected]
; \
+ echo '(setq vm-version-commit-config "unknown")' >> [email protected] ; \
fi
mv -f [email protected] $@
diff --git a/lisp/vm-biff.el b/lisp/vm-biff.el
index f4398b4f588..0fd1101291c 100644
--- a/lisp/vm-biff.el
+++ b/lisp/vm-biff.el
@@ -517,7 +517,7 @@ AddToFunc SelectWindow
'vm-biff-timer-delete-popup wf))))))))
; add hook only when explictly requring this module
-(when (not (or (bound-and-true-p byte-compile-current-file) (bound-and-true-p
comp-compile-warning-errors)))
+(unless (bound-and-true-p byte-compile-current-file)
(add-hook 'vm-arrived-messages-hook 'vm-biff-popup t))
(provide 'vm-biff)
diff --git a/lisp/vm-build.el b/lisp/vm-build.el
index ef330de0657..46d942222c3 100644
--- a/lisp/vm-build.el
+++ b/lisp/vm-build.el
@@ -104,7 +104,7 @@
"-autoloads"))
(save-some-buffers t))
;; GNU Emacs 21 wants some content, but 22 does not like it ...
- (insert ";;; vm-autoloads.el --- automatically extracted autoloads\n")
+ (insert ";;; vm-autoloads.el --- automatically extracted autoloads -*-
lexical-binding: t; -*-\n")
(insert ";;\n")
(insert ";;; Code:\n")
(cond
diff --git a/lisp/vm.el b/lisp/vm.el
index 7297fffa156..8625b7d589d 100644
--- a/lisp/vm.el
+++ b/lisp/vm.el
@@ -63,6 +63,19 @@
(defvar enable-multibyte-characters)
+(defvar vm-version nil
+ "Version number of VM.")
+
+(defvar vm-version-commit nil
+ "Git commit number of VM.")
+
+(defvar vm-version-config nil
+ "Version number of VM from generated file when building using make.")
+
+(defvar vm-version-commit-config nil
+ "Git commit number of VM from generated file when building using make.")
+
+
;; vm-xemacs.el is a non-existent file to fool the Emacs 23 compiler
(declare-function get-coding-system "vm-xemacs.el" (name))
(declare-function find-face "vm-xemacs.el" (face-or-name))
@@ -1718,10 +1731,8 @@ draft messages."
(let ((version-info (or (vm--version-info-from-conf)
(vm--version-info-from-package)
(list nil nil))))
- (defconst vm-version (nth 0 version-info)
- "Version number of VM.")
- (defconst vm-version-commit (nth 1 version-info)
- "Git commit number of VM.")
+ (setq vm-version (nth 0 version-info)
+ vm-version-commit (nth 1 version-info))
(unless vm-version
(warn "Can't obtain vm-version from package or vm-version-conf.el"))
(unless vm-version-commit
