[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a9d7ccf: Revert "package.el: Allow Package-Requires
From: |
Thomas Fitzsimmons |
Subject: |
[Emacs-diffs] master a9d7ccf: Revert "package.el: Allow Package-Requires to span multiple lines (Bug#36301)" |
Date: |
Fri, 16 Aug 2019 12:20:34 -0400 (EDT) |
branch: master
commit a9d7ccfa56cf5985a9f4485b4d8b935871b721f9
Author: Thomas Fitzsimmons <address@hidden>
Commit: Thomas Fitzsimmons <address@hidden>
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.
---
lisp/emacs-lisp/package.el | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index e6815fd..a72522a 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master a9d7ccf: Revert "package.el: Allow Package-Requires to span multiple lines (Bug#36301)",
Thomas Fitzsimmons <=