aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Willemse2014-03-13 09:34:01 -0400
committerStefan Monnier2014-03-13 09:34:01 -0400
commit0d71dfb381a49ba12fe2af39ed11c945e982a203 (patch)
tree99b90095baad89572da7190bd4061552d9683f5a
parentacc112c7a7ffdf68cd670913a0f7258759843fbe (diff)
downloademacs-0d71dfb381a49ba12fe2af39ed11c945e982a203.tar.gz
emacs-0d71dfb381a49ba12fe2af39ed11c945e982a203.zip
* lisp/emacs-lisp/package.el (package--prepare-dependencies):
Accept requirements without explicit version. Fixes: debbugs:14941
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/package.el2
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d051434bb31..e3589f888a9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-03-13 Tom Willemse <tom@ryuslash.org> (tiny change)
2
3 * emacs-lisp/package.el (package--prepare-dependencies):
4 Accept requirements without explicit version (bug#14941).
5
12014-03-12 Juanma Barranquero <lekktu@gmail.com> 62014-03-12 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * register.el (register-separator, copy-to-register): Doc fixes. 8 * register.el (register-separator, copy-to-register): Doc fixes.
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index b15ae6f1376..53d72f9a8dc 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1128,6 +1128,8 @@ is wrapped around any parts requiring it."
1128 ((symbolp dep) `(,dep "0")) 1128 ((symbolp dep) `(,dep "0"))
1129 ((stringp dep) 1129 ((stringp dep)
1130 (error "Invalid requirement specifier: %S" dep)) 1130 (error "Invalid requirement specifier: %S" dep))
1131 ((and (listp dep) (null (cdr dep)))
1132 (list (car dep) "0"))
1131 (t dep))) 1133 (t dep)))
1132 deps)))) 1134 deps))))
1133 1135