* lisp/emacs-lisp/package.el (package--add-to-archive-contents): Add missing

nil to terminate the loop.

Fixes: debbugs:14718

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 493052d4dcb81d28940fe27636a0706647154c3c..3ac3a0f2b9299849402a74d1a515aa9dce794c91 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/package.el (package--add-to-archive-contents): Add missing
+       nil terminate the loop (bug#14718).
+
 2013-06-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * net/eww.el: Rework history traversal.  When going forward/back,
@@ -24,7 +29,7 @@
 
 2013-06-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-       * net/eww.el (eww-copy-page-url): Changed name of command.
+       * net/eww.el (eww-copy-page-url): Change name of command.
 
        * net/shr.el (shr-map): Change `shr-copy-url' from `u' to `w' to
        be more consistent with Info and dired.

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index e141ea572f1629fea31360fce9ff1c40158cb762..323392490859793f3075552c959cbb2dda6fa82a 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
 ;; Author: Tom Tromey <tromey@redhat.com>
+;;         Daniel Hackney <dan@haxney.org>
 ;; Created: 10 Mar 2007
 ;; Version: 1.0.1
 ;; Keywords: tools
@@ -924,7 +925,8 @@ Also, add the originating archive to the `package-desc' structure."
                    (version-list-<
                     version (package-desc-version (cadr existing-packages))))
               (setq existing-packages (cdr existing-packages))
-            (push pkg-desc (cdr existing-packages))))))))
+            (push pkg-desc (cdr existing-packages))
+            nil))))))
 
 (defun package-download-transaction (packages)
   "Download and install all the packages in PACKAGES.