diff options
| author | Thomas Fitzsimmons <fitzsim@fitzsim.org> | 2019-08-16 12:17:40 -0400 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@fitzsim.org> | 2019-08-16 12:18:44 -0400 |
| commit | a9d7ccfa56cf5985a9f4485b4d8b935871b721f9 (patch) | |
| tree | 67112bfcb383a14ca22a7fcf8072b91cfc68e355 /lisp/emacs-lisp/package.el | |
| parent | 405f851f4bf64e2290e841b65ffabf37c61187f4 (diff) | |
| download | emacs-a9d7ccfa56cf5985a9f4485b4d8b935871b721f9.tar.gz emacs-a9d7ccfa56cf5985a9f4485b4d8b935871b721f9.tar.bz2 emacs-a9d7ccfa56cf5985a9f4485b4d8b935871b721f9.zip | |
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.
Diffstat (limited to 'lisp/emacs-lisp/package.el')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 4 |
1 files changed, 1 insertions, 3 deletions
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 |