From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 9 Aug 2021 16:05:22 +0000 (-0400)
Subject: * lisp/emacs-lisp/package.el (package-buffer-info): Use lm-maintainers
X-Git-Tag: emacs-28.0.90~1573
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4e6f98cd505ed56e7928fcdb5ab88c09d0e74d89;p=emacs.git

* lisp/emacs-lisp/package.el (package-buffer-info): Use lm-maintainers

Avoid the now obsolete `lm-maintainer`.
---

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 82ea9e73658..dac412c98b6 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1120,7 +1120,7 @@ is wrapped around any parts requiring it."
 (declare-function lm-header-multiline "lisp-mnt" (header))
 (declare-function lm-homepage "lisp-mnt" (&optional file))
 (declare-function lm-keywords-list "lisp-mnt" (&optional file))
-(declare-function lm-maintainer "lisp-mnt" (&optional file))
+(declare-function lm-maintainers "lisp-mnt" (&optional file))
 (declare-function lm-authors "lisp-mnt" (&optional file))
 
 (defun package-buffer-info ()
@@ -1166,7 +1166,10 @@ boundaries."
        :kind 'single
        :url homepage
        :keywords keywords
-       :maintainer (lm-maintainer)
+       :maintainer
+       ;; For backward compatibility, use a single string if there's only
+       ;; one maintainer (the most common case).
+       (let ((maints (lm-maintainers))) (if (cdr maints) maints (cat maints)))
        :authors (lm-authors)))))
 
 (defun package--read-pkg-desc (kind)