branch: elpa/vm
commit 4f821eff383dcf0e9042eedf454e861760912381
Author: Mark Diekhans <[email protected]>
Commit: Mark Diekhans <[email protected]>
Increase minimum version to 28.1 to allow package-desc-extras.
---
lisp/vm.el | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lisp/vm.el b/lisp/vm.el
index 5dc96bb7cc1..d477d25b28a 100644
--- a/lisp/vm.el
+++ b/lisp/vm.el
@@ -1,4 +1,4 @@
-;;; vm.el --- VM mail reader for Emacs -*- lexical-binding: t -*-
+;;; vm.el --- VM mail reader -*- lexical-binding: t -*-
;;
;; This file is part of VM
;;
@@ -9,7 +9,7 @@
;; Version: 8.3.0
;; Maintainer: [email protected]
;; URL: https://gitlab.com/emacs-vm/vm
-;; Package-Requires: ((emacs "28.0") (vcard "0.2.2"))
+;; Package-Requires: ((emacs "28.1") (vcard "0.2.2"))
;; Keywords: mail
;;
;; This program is free software; you can redistribute it and/or modify
@@ -62,7 +62,8 @@
(eval-when-compile (require 'cl-lib))
(require 'package)
-(defconst vm-min-emacs-version "28.0"
+;; keep vm-min-emacs-version in sync with above Package-Requires
+(defconst vm-min-emacs-version "28.1"
"Minimum Emacs version supported by VM.")
(defvar enable-multibyte-characters)
@@ -82,7 +83,7 @@
;; 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))
+(declare-function facep "vm-xemacs.el" (face-or-name))
(declare-function vm-rfaddons-infect-vm "vm-rfaddons.el"
(&optional sit-for option-list exclude-option-list))
@@ -1720,9 +1721,8 @@ draft messages."
(defun vm--commit-from-package (pkg)
"Get commit hash from PKG, whether VC-installed or archive-installed."
(let ((desc (package-get-descriptor pkg)))
- (or (when (package-vc-p desc)
- (package-vc-commit desc))
- (alist-get :commit (package-desc-extras desc)))))
+ (or (alist-get :commit (package-desc-extras desc))
+ "unknown-commit")))
(defun vm--version-info-from-package ()
"Return version and commit if VM is loaded from a package."
