diff options
| author | Thomas Fitzsimmons <fitzsim@fitzsim.org> | 2019-08-15 23:57:55 -0400 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@fitzsim.org> | 2019-08-16 00:02:13 -0400 |
| commit | 19c1e4c81c7442dea48253e5961b6e54d78b6f0a (patch) | |
| tree | b620a039efb71e81b20123a75fbf821bda11fff0 /lisp/emacs-lisp/package.el | |
| parent | c02f3125cd6c1843731ab96f156c8ea24dcfe898 (diff) | |
| download | emacs-19c1e4c81c7442dea48253e5961b6e54d78b6f0a.tar.gz emacs-19c1e4c81c7442dea48253e5961b6e54d78b6f0a.tar.bz2 emacs-19c1e4c81c7442dea48253e5961b6e54d78b6f0a.zip | |
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)
Diffstat (limited to 'lisp/emacs-lisp/package.el')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 4 |
1 files changed, 3 insertions, 1 deletions
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 |