diff options
| author | Artur Malabarba | 2015-01-18 10:13:07 -0200 |
|---|---|---|
| committer | Artur Malabarba | 2015-01-18 10:13:07 -0200 |
| commit | 3ccbda730d654949b774a7ff99a759957991cb5c (patch) | |
| tree | 4cd45e55f3649499d81fac401fb2bdba37af3e09 | |
| parent | 253d44bd27b7d90b614b6b968a3b125eeb0a48f2 (diff) | |
| download | emacs-3ccbda730d654949b774a7ff99a759957991cb5c.tar.gz emacs-3ccbda730d654949b774a7ff99a759957991cb5c.zip | |
package.el (package--append-to-alist): Renamed from `add-to-alist'
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 6 |
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 @@ | |||
| 1 | 2015-01-18 Artur Malabarba <bruce.connor.am@gmail.com> | ||
| 2 | |||
| 3 | * emacs-lisp/package.el (package--append-to-alist): Renamed from | ||
| 4 | `package--add-to-alist' | ||
| 5 | |||
| 1 | 2015-01-18 Leo Liu <sdl.web@gmail.com> | 6 | 2015-01-18 Leo Liu <sdl.web@gmail.com> |
| 2 | 7 | ||
| 3 | * emacs-lisp/cl-extra.el (cl-subseq): Use seq-subseq and fix | 8 | * 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." | |||
| 1154 | (when (not (and pinned-to-archive | 1154 | (when (not (and pinned-to-archive |
| 1155 | (not (equal (cdr pinned-to-archive) archive)))) | 1155 | (not (equal (cdr pinned-to-archive) archive)))) |
| 1156 | (setq package-archive-contents | 1156 | (setq package-archive-contents |
| 1157 | (package--add-to-alist pkg-desc package-archive-contents))))) | 1157 | (package--append-to-alist pkg-desc package-archive-contents))))) |
| 1158 | 1158 | ||
| 1159 | (defun package--add-to-alist (pkg-desc alist) | 1159 | (defun package--append-to-alist (pkg-desc alist) |
| 1160 | "Add PKG-DESC to ALIST. | 1160 | "Add PKG-DESC to ALIST. |
| 1161 | 1161 | ||
| 1162 | Packages are grouped by name. The package descriptions are sorted | 1162 | 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." | |||
| 2100 | (cond ((member status '("installed" "unsigned")) | 2100 | (cond ((member status '("installed" "unsigned")) |
| 2101 | (push pkg-desc installed)) | 2101 | (push pkg-desc installed)) |
| 2102 | ((member status '("available" "new")) | 2102 | ((member status '("available" "new")) |
| 2103 | (setq available (package--add-to-alist pkg-desc available)))))) | 2103 | (setq available (package--append-to-alist pkg-desc available)))))) |
| 2104 | ;; Loop through list of installed packages, finding upgrades. | 2104 | ;; Loop through list of installed packages, finding upgrades. |
| 2105 | (dolist (pkg-desc installed) | 2105 | (dolist (pkg-desc installed) |
| 2106 | (let* ((name (package-desc-name pkg-desc)) | 2106 | (let* ((name (package-desc-name pkg-desc)) |