diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b5824abd01f..c843bdd56f2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-01-20 Artur Malabarba <bruce.connor.am@gmail.com> + + * emacs-lisp/package.el (package-dir-info): Fix `while' logic. + 2015-01-20 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/eieio-generic.el: Remove. diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 0f094b556ba..88fc950ee21 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1316,9 +1316,14 @@ The return result is a `package-desc'." (while files (with-temp-buffer (insert-file-contents (pop files)) - (if (setq info (ignore-errors (package-buffer-info))) - (setq files nil) - (setf (package-desc-kind info) 'dir)))))))) + ;; When we find the file with the data, + (when (setq info (ignore-errors (package-buffer-info))) + ;; stop looping, + (setq files nil) + ;; set the 'dir kind, + (setf (package-desc-kind info) 'dir)))) + ;; and return the info. + info)))) (defun package--read-pkg-desc (kind) "Read a `define-package' form in current buffer. |