From 19c1e4c81c7442dea48253e5961b6e54d78b6f0a Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Thu, 15 Aug 2019 23:57:55 -0400 Subject: [PATCH] package.el: Allow Package-Requires to span multiple lines (Bug#36301) * lisp/emacs-lisp/package.el (lm-header-multiline): Declare function. (package-buffer-info): Parse Package-Requires with lm-header-multiline instead of lm-header. (Bug#36301) --- lisp/emacs-lisp/package.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index a72522ad8f8..e6815fd9644 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1028,6 +1028,7 @@ is wrapped around any parts requiring it." deps)))) (declare-function lm-header "lisp-mnt" (header)) +(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)) @@ -1054,7 +1055,8 @@ boundaries." (narrow-to-region start (point)) (require 'lisp-mnt) ;; Use some headers we've invented to drive the process. - (let* ((requires-str (lm-header "package-requires")) + (let* ((requires-str + (mapconcat 'identity (lm-header-multiline "package-requires") " ")) ;; Prefer Package-Version; if defined, the package author ;; probably wants us to use it. Otherwise try Version. (pkg-version -- 2.39.2