From: Thomas Fitzsimmons <fitzsim@fitzsim.org>
Date: Fri, 16 Aug 2019 16:17:40 +0000 (-0400)
Subject: Revert "package.el: Allow Package-Requires to span multiple lines (Bug#36301)"
X-Git-Tag: emacs-27.0.90~1596
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a9d7ccfa56cf5985a9f4485b4d8b935871b721f9;p=emacs.git

Revert "package.el: Allow Package-Requires to span multiple lines (Bug#36301)"

This reverts commit 19c1e4c81c7442dea48253e5961b6e54d78b6f0a.

This commit broke some package tests, reverting for now.
---

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index e6815fd9644..a72522ad8f8 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1028,7 +1028,6 @@ 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))
@@ -1055,8 +1054,7 @@ boundaries."
     (narrow-to-region start (point))
     (require 'lisp-mnt)
     ;; Use some headers we've invented to drive the process.
-    (let* ((requires-str
-            (mapconcat 'identity (lm-header-multiline "package-requires") " "))
+    (let* ((requires-str (lm-header "package-requires"))
            ;; Prefer Package-Version; if defined, the package author
            ;; probably wants us to use it.  Otherwise try Version.
            (pkg-version