branch: elpa/vm
commit e93a782fe67e4259d2f94ea2572a93c16e4f3a10
Author: Mark Diekhans <[email protected]>
Commit: Mark Diekhans <[email protected]>
fixed various warning
---
lisp/Makefile.in | 10 ++++++----
lisp/vm-build.el | 2 +-
lisp/vm.el | 19 +++++++++++++++----
3 files changed, 22 insertions(+), 9 deletions(-)
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-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
