From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Dario Gjorgjevski Newsgroups: gmane.emacs.bugs Subject: bug#38085: [PATCH] Two functions named =?UTF-8?Q?=E2=80=98package-menu--refresh=E2=80=99?= Date: Wed, 06 Nov 2019 10:10:48 +0100 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="84444"; mail-complaints-to="usenet@blaine.gmane.org" To: 38085@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Nov 06 10:11:26 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iSHLa-000LtC-N2 for geb-bug-gnu-emacs@m.gmane.org; Wed, 06 Nov 2019 10:11:26 +0100 Original-Received: from localhost ([::1]:54248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iSHLZ-00016d-DR for geb-bug-gnu-emacs@m.gmane.org; Wed, 06 Nov 2019 04:11:25 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53111) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iSHLF-00013k-1E for bug-gnu-emacs@gnu.org; Wed, 06 Nov 2019 04:11:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iSHLD-000517-48 for bug-gnu-emacs@gnu.org; Wed, 06 Nov 2019 04:11:04 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:58862) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iSHLD-00050z-02 for bug-gnu-emacs@gnu.org; Wed, 06 Nov 2019 04:11:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iSHLC-0001kM-PC for bug-gnu-emacs@gnu.org; Wed, 06 Nov 2019 04:11:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dario Gjorgjevski Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 06 Nov 2019 09:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38085 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.15730314606704 (code B ref -1); Wed, 06 Nov 2019 09:11:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 6 Nov 2019 09:11:00 +0000 Original-Received: from localhost ([127.0.0.1]:39450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iSHL9-0001k3-1C for submit@debbugs.gnu.org; Wed, 06 Nov 2019 04:11:00 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:55152) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iSHL7-0001ju-Dh for submit@debbugs.gnu.org; Wed, 06 Nov 2019 04:10:57 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53043) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iSHL5-0000x5-D8 for bug-gnu-emacs@gnu.org; Wed, 06 Nov 2019 04:10:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iSHL3-0004yt-6r for bug-gnu-emacs@gnu.org; Wed, 06 Nov 2019 04:10:55 -0500 Original-Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:51305) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iSHL2-0004yI-Tx for bug-gnu-emacs@gnu.org; Wed, 06 Nov 2019 04:10:53 -0500 Original-Received: by mail-wm1-x32c.google.com with SMTP id q70so2447371wme.1 for ; Wed, 06 Nov 2019 01:10:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=J+tXaaapfOwnnubICtAjWaUB9AEpL/oqIRRmz344Ahg=; b=CdaxEAzPd2y4G8OiEa8FZXFwQ1KgZX6bGol4s2ASjWnqwq4fS90VK+6+3JBUXoqMsh wPcVEip6hxVlhx+yt7NyCs1re6L5xFjMC4PvfIikBo+R+sy9qhuF1lg4nitvPp/4sCIg dZNT8e66Hzr2bw/YKugAsCafv1F5lBQ0PLZiTUzjYZ2TnSQflSEogEDXEForFfTQkrlB DeIpNLeLzLvMBpQdH4SBnLBUfsvvVynBeW88W5hAq643ukTOwFhBrXR1/a3PVBSxthyG eAuD0N6602GIDasjuYf4zo0r2+Rf2aUggTvPdHghbjKf883u2AWgS8JDPQoZS3cxyzWF Yiog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=J+tXaaapfOwnnubICtAjWaUB9AEpL/oqIRRmz344Ahg=; b=IxRE/QnbsllbXDcQvilfOOpa+xl+UIZoXtMD9I3uFclbwBNgPw7szJoFHPDfKnGcRT znSB4f/LHBLWRL7ieWvdPSZ6UT4BPalh0rULNltjW6QdKsqB2FgF+sqVt45kkFY55cGn uwWWY3+loeuFQNXeuoBPnVb7AHG5qodvtRCkUHF9No/0sRqi3/pDIeJvirgyGPi474SM hecYT/wRv+te04tQogr0BFvgL30sli45m05oA6s4pgoNU17nDkrVoUNBrWKtYhmH5UXv /OcvAPAqJyZH9Pw8F1orfIPa/yVLAsWKYei6YRaWOKFzT3jXjh2UGgn6aPeZdUbdEhUr 3U2Q== X-Gm-Message-State: APjAAAW+gdtOXGkN+hZVlWyBESx2RjHDTTUBSnMZlcKukjbHjJB1SyXu 1QhCQv89SMxXCLzxnfTW36dMJ6if X-Google-Smtp-Source: APXvYqylTHLpq96zscCRgmLkLgp1h6YwrQ+YNG2+MD2s8phtCUU47fn7F1qVHkP0lPI1bhv5uHCMtg== X-Received: by 2002:a7b:cae2:: with SMTP id t2mr1342729wml.161.1573031450738; Wed, 06 Nov 2019 01:10:50 -0800 (PST) Original-Received: from ZALANDO-31298 ([185.85.220.254]) by smtp.gmail.com with ESMTPSA id q6sm24343221wrx.30.2019.11.06.01.10.49 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Nov 2019 01:10:49 -0800 (PST) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:171014 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Commit 0c293f1520 caused a conflict such that there are now two functions named =E2=80=98package-menu--refresh=E2=80=99. The attached patch renames them to: * =E2=80=98package-menu--refresh-entries=E2=80=99, which refreshes =E2=80=98tabulated-list-entries=E2=80=99; and * =E2=80=98package-menu--refresh-contents=E2=80=99, which refreshes the arc= hive contents. --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-Disambiguate-package-menu-refresh.patch Content-Transfer-Encoding: quoted-printable Content-Description: Disambiguate `package-menu--refresh' >From ab0287bc66241907d1f4915d1a35c25f7bc2dda5 Mon Sep 17 00:00:00 2001 From: dgjorgjevski Date: Wed, 6 Nov 2019 09:53:38 +0100 Subject: [PATCH] =3D?UTF-8?q?Disambiguate=3D20=3DE2=3D80=3D98package-menu--= refresh?=3D =3D?UTF-8?q?=3DE2=3D80=3D99?=3D MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit * lisp/emacs-lisp/package.el (package-menu--refresh, package-menu--refresh): Rename to =E2=80=98package-menu--refresh-entries=E2= =80=99 and =E2=80=98package-menu--refresh-contents=E2=80=99 in order to disambiguate t= he 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 ni= l 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"))) =20 -(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 =20 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.") =20 -(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) =20 ;; Fetch the remote list of packages. - (unless no-fetch (package-menu--refresh)) + (unless no-fetch (package-menu--refresh-contents)) =20 ;; 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)))) --=20 2.17.1 --=-=-=--