branch: elpa/vm
commit a627df13ed7cf7d4284ef55d662b36ff8b22735d
Author: Mark Diekhans <ma...@ucsc.edu>
Commit: Mark Diekhans <ma...@ucsc.edu>
Handle cases where vm-version variable is nil. vm-version funcion will
return "unknown"
---
lisp/vm-vars.el | 2 +-
lisp/vm-version.el | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lisp/vm-vars.el b/lisp/vm-vars.el
index 464fe04974..8b5422d774 100644
--- a/lisp/vm-vars.el
+++ b/lisp/vm-vars.el
@@ -6851,7 +6851,7 @@ append a space to words that complete unambiguously.")
(vm-ml-labels ("; " vm-ml-labels)) " %] ")
(" %[%] "))
"%p"
- " (VM " vm-version ")"
+ " (VM " (vm-version) ")"
global-mode-string
"%-"))
(defconst vm-mode-line-format-classic
diff --git a/lisp/vm-version.el b/lisp/vm-version.el
index 03632f9b40..a6be94ee7e 100644
--- a/lisp/vm-version.el
+++ b/lisp/vm-version.el
@@ -65,8 +65,8 @@
(when (vm-interactive-p)
(if vm-version
(message "VM version is: %s" vm-version)
- (message "VM version was not discovered when VM was loaded"))
- vm-version))
+ (message "VM version was not discovered when VM was loaded")))
+ (or vm-version "unknown"))
(defun vm-version-commit ()
"Display and the value of the variable `vm-version-commit'."
@@ -74,8 +74,8 @@
(when (vm-interactive-p)
(if vm-version-commit
(message "VM commit is: %s" vm-version-commit)
- (message "VM commit was not discovered when VM was loaded"))
- vm-version-commit))
+ (message "VM commit was not discovered when VM was loaded")))
+ (or vm-version-commit "unknown"))
(defun vm-menu-can-eval-item-name ()
(and (featurep 'xemacs)
