summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/package.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 680adc71d0a..07c873d8a68 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-18 Artur Malabarba <bruce.connor.am@gmail.com>
+
+ * emacs-lisp/package.el (package--append-to-alist): Renamed from
+ `package--add-to-alist'
+
2015-01-18 Leo Liu <sdl.web@gmail.com>
* emacs-lisp/cl-extra.el (cl-subseq): Use seq-subseq and fix
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 4be3b584a72..07ddddddb99 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1154,9 +1154,9 @@ Also, add the originating archive to the `package-desc' structure."
(when (not (and pinned-to-archive
(not (equal (cdr pinned-to-archive) archive))))
(setq package-archive-contents
- (package--add-to-alist pkg-desc package-archive-contents)))))
+ (package--append-to-alist pkg-desc package-archive-contents)))))
-(defun package--add-to-alist (pkg-desc alist)
+(defun package--append-to-alist (pkg-desc alist)
"Add PKG-DESC to ALIST.
Packages are grouped by name. The package descriptions are sorted
@@ -2100,7 +2100,7 @@ If optional arg BUTTON is non-nil, describe its associated package."
(cond ((member status '("installed" "unsigned"))
(push pkg-desc installed))
((member status '("available" "new"))
- (setq available (package--add-to-alist pkg-desc available))))))
+ (setq available (package--append-to-alist pkg-desc available))))))
;; Loop through list of installed packages, finding upgrades.
(dolist (pkg-desc installed)
(let* ((name (package-desc-name pkg-desc))