[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#38085: [PATCH] Two functions named ‘package-menu--refresh’
From: |
Dario Gjorgjevski |
Subject: |
bug#38085: [PATCH] Two functions named ‘package-menu--refresh’ |
Date: |
Wed, 06 Nov 2019 10:50:36 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) |
Tino Calancha <tino.calancha@gmail.com> writes:
> I mean, this is bug 38084
Thanks; I did not realize that there is already a bug. Here is an
amended patch which references bug#38084 in the commit message.
>From 5b648752499a528ed23f257deccb4a4f5ef0d009 Mon Sep 17 00:00:00 2001
From: Dario Gjorgjevski <dario.gjorgjevski+git@gmail.com>
Date: Wed, 6 Nov 2019 09:53:38 +0100
Subject: [PATCH] =?UTF-8?q?Disambiguate=20=E2=80=98package-menu--refresh?=
=?UTF-8?q?=E2=80=99=20(bug#38084)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* lisp/emacs-lisp/package.el (package-menu--refresh,
package-menu--refresh): Rename to ‘package-menu--refresh-entries’ and
‘package-menu--refresh-contents’ in order to disambiguate the two.
---
lisp/emacs-lisp/package.el | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index b7a528dac4..b35fe022de 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2765,9 +2765,9 @@ package-menu-mode
("Description" 0 package-menu--description-predicate)])
(setq tabulated-list-padding 2)
(setq tabulated-list-sort-key (cons "Status" nil))
- (add-hook 'tabulated-list-revert-hook #'package-menu--refresh nil t)
+ (add-hook 'tabulated-list-revert-hook #'package-menu--refresh-entries 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
@@ -2926,7 +2926,7 @@ package-hidden-regexps
:version "25.1"
:type '(repeat (regexp :tag "Hide packages with name matching")))
-(defun package-menu--refresh (&optional packages keywords)
+(defun package-menu--refresh-entries (&optional packages keywords)
"Re-populate the `tabulated-list-entries'.
PACKAGES should be nil or t, which means to display all known packages.
KEYWORDS should be nil or a list of keywords."
@@ -3039,7 +3039,7 @@ package-menu--generate
With KEYWORDS given, only packages with those keywords are
shown."
- (package-menu--refresh packages keywords)
+ (package-menu--refresh-entries packages keywords)
(setf (car (aref tabulated-list-format 0))
(if keywords
(let ((filters (mapconcat #'identity keywords ",")))
@@ -3166,7 +3166,7 @@ package-menu--print-info-simple
(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 @@ list-packages
(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
@@ -3706,7 +3706,7 @@ package-menu-filter-by-name
(package-show-package-list t nil)
;; Update `tabulated-list-entries' so that it contains all
;; packages before searching.
- (package-menu--refresh t nil)
+ (package-menu--refresh-entries t nil)
(let (matched)
(dolist (entry tabulated-list-entries)
(let* ((pkg-name (package-desc-name (car entry))))
--
2.17.1