Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
f77d7d17
Commit
f77d7d17
authored
Dec 14, 2013
by
Tom Willemse
Committed by
Stefan Monnier
Dec 14, 2013
Browse files
* lisp/emacs-lisp/package.el (package--prepare-dependencies): New function.
(package-buffer-info): Use it. Fixes: debbugs:15108
parent
aa2bddd7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
2 deletions
+24
-2
lisp/ChangeLog
lisp/ChangeLog
+4
-1
lisp/emacs-lisp/package.el
lisp/emacs-lisp/package.el
+20
-1
No files found.
lisp/ChangeLog
View file @
f77d7d17
2013-12-14 Stefan Monnier <monnier@iro.umontreal.ca>
2013-12-14 Tom Willemse <tom@ryuslash.org> (tiny change)
* emacs-lisp/package.el (package--prepare-dependencies): New function.
(package-buffer-info): Use it (bug#15108).
* icomplete.el (icomplete-completions): Make sure the prefix is already
* icomplete.el (icomplete-completions): Make sure the prefix is already
displayed elsewhere before hiding it.
displayed elsewhere before hiding it.
...
...
lisp/emacs-lisp/package.el
View file @
f77d7d17
...
@@ -1104,6 +1104,23 @@ Otherwise return nil."
...
@@ -1104,6 +1104,23 @@ Otherwise return nil."
(declare-function lm-homepage "
lisp-mnt
" (&optional file))
(declare-function lm-homepage "
lisp-mnt
" (&optional file))
(defun package--prepare-dependencies (deps)
"
Turn
DEPS
into
an
acceptable
list
of
dependencies.
Any
parts
missing
a
version
string
get
a
default
version
string
of
\"0\"
(
meaning
any
version
)
and
an
appropriate
level
of
lists
is
wrapped
around
any
parts
requiring
it.
"
(cond
((not (listp deps))
(error "
Invalid
requirement
specifier:
%S
" deps))
(t (mapcar (lambda (dep)
(cond
((symbolp dep) `(,dep "
0
"))
((stringp dep)
(error "
Invalid
requirement
specifier:
%S
" dep))
(t dep)))
deps))))
(defun package-buffer-info ()
(defun package-buffer-info ()
"
Return
a
`
package-desc
'
describing
the
package
in
the
current
buffer.
"
Return
a
`
package-desc
'
describing
the
package
in
the
current
buffer.
...
@@ -1135,7 +1152,9 @@ boundaries."
...
@@ -1135,7 +1152,9 @@ boundaries."
"Package lacks a \"Version\" or \"Package-Version\" header"
))
"Package lacks a \"Version\" or \"Package-Version\" header"
))
(
package-desc-from-define
(
package-desc-from-define
file-name
pkg-version
desc
file-name
pkg-version
desc
(
if
requires-str
(
package-read-from-string
requires-str
))
(
if
requires-str
(
package--prepare-dependencies
(
package-read-from-string
requires-str
)))
:kind
'single
:kind
'single
:url
homepage
))))
:url
homepage
))))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment