]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix problem with my last commit in package.el
authorStefan Kangas <stefankangas@gmail.com>
Wed, 6 Nov 2019 13:48:23 +0000 (14:48 +0100)
committerStefan Kangas <stefankangas@gmail.com>
Wed, 6 Nov 2019 14:01:37 +0000 (15:01 +0100)
* 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.

lisp/emacs-lisp/package.el

index b7a528dac49b1ee8af8cba7b848e83b1d8fd295f..9f8ee8368e6094421ee9b308d9502e32a235a127 100644 (file)
@@ -2767,7 +2767,7 @@ Letters do not insert themselves; instead, they are commands.
   (setq tabulated-list-sort-key (cons "Status" nil))
   (add-hook 'tabulated-list-revert-hook #'package-menu--refresh nil t)
   (tabulated-list-init-header)
-  (setq revert-buffer-function 'package-menu--refresh)
+  (setq revert-buffer-function 'package-menu--refresh-contents)
   (setf imenu-prev-index-position-function
         #'package--imenu-prev-index-position-function)
   (setf imenu-extract-index-name-function
@@ -3166,7 +3166,7 @@ Return (PKG-DESC [NAME VERSION STATUS DOC])."
 (defvar package-menu--old-archive-contents nil
   "`package-archive-contents' before the latest refresh.")
 
-(defun package-menu--refresh (&optional _arg _noconfirm)
+(defun package-menu--refresh-contents (&optional _arg _noconfirm)
   "In Package Menu, download the Emacs Lisp package archive.
 Fetch the contents of each archive specified in
 `package-archives', and then refresh the package menu.  Signal a
@@ -3646,7 +3646,7 @@ short description."
       (package-menu-mode)
 
       ;; Fetch the remote list of packages.
-      (unless no-fetch (package-menu--refresh))
+      (unless no-fetch (package-menu--refresh-contents))
 
       ;; If we're not async, this would be redundant.
       (when package-menu-async