aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2019-11-06 14:48:23 +0100
committerStefan Kangas2019-11-06 15:01:37 +0100
commitd30f5e7eeecd5425e236542189a1d683c00e7ed7 (patch)
treeaa9d08e20bbcfade4d7099259dea848ad0d6560d
parent2b1dc8c26e243d4eb9eeac0ddadd6b59d0b9f072 (diff)
downloademacs-d30f5e7eeecd5425e236542189a1d683c00e7ed7.tar.gz
emacs-d30f5e7eeecd5425e236542189a1d683c00e7ed7.zip
Fix problem with my last commit in package.el
* lisp/emacs-lisp/package.el (package-menu--refresh-archives): Rename from duplicated name package-menu--refresh. (Bug#38084) (package-menu-mode, list-packages): Use new name.
-rw-r--r--lisp/emacs-lisp/package.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index b7a528dac49..9f8ee8368e6 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2767,7 +2767,7 @@ Letters do not insert themselves; instead, they are commands.
2767 (setq tabulated-list-sort-key (cons "Status" nil)) 2767 (setq tabulated-list-sort-key (cons "Status" nil))
2768 (add-hook 'tabulated-list-revert-hook #'package-menu--refresh nil t) 2768 (add-hook 'tabulated-list-revert-hook #'package-menu--refresh nil t)
2769 (tabulated-list-init-header) 2769 (tabulated-list-init-header)
2770 (setq revert-buffer-function 'package-menu--refresh) 2770 (setq revert-buffer-function 'package-menu--refresh-contents)
2771 (setf imenu-prev-index-position-function 2771 (setf imenu-prev-index-position-function
2772 #'package--imenu-prev-index-position-function) 2772 #'package--imenu-prev-index-position-function)
2773 (setf imenu-extract-index-name-function 2773 (setf imenu-extract-index-name-function
@@ -3166,7 +3166,7 @@ Return (PKG-DESC [NAME VERSION STATUS DOC])."
3166(defvar package-menu--old-archive-contents nil 3166(defvar package-menu--old-archive-contents nil
3167 "`package-archive-contents' before the latest refresh.") 3167 "`package-archive-contents' before the latest refresh.")
3168 3168
3169(defun package-menu--refresh (&optional _arg _noconfirm) 3169(defun package-menu--refresh-contents (&optional _arg _noconfirm)
3170 "In Package Menu, download the Emacs Lisp package archive. 3170 "In Package Menu, download the Emacs Lisp package archive.
3171Fetch the contents of each archive specified in 3171Fetch the contents of each archive specified in
3172`package-archives', and then refresh the package menu. Signal a 3172`package-archives', and then refresh the package menu. Signal a
@@ -3646,7 +3646,7 @@ short description."
3646 (package-menu-mode) 3646 (package-menu-mode)
3647 3647
3648 ;; Fetch the remote list of packages. 3648 ;; Fetch the remote list of packages.
3649 (unless no-fetch (package-menu--refresh)) 3649 (unless no-fetch (package-menu--refresh-contents))
3650 3650
3651 ;; If we're not async, this would be redundant. 3651 ;; If we're not async, this would be redundant.
3652 (when package-menu-async 3652 (when package-menu-async