summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2020-02-13 07:50:24 -0800
committerGlenn Morris <rgm@gnu.org>2020-02-13 07:50:24 -0800
commit56ce263f506fede328888a321a12b1f85f46d0d5 (patch)
tree1d881d6ca6c46b62cffaa93e25ff4b88f3bcc2c7 /lisp/emacs-lisp
parent5b160b39c43b7e3d4e377832c306e2e48b53e7e1 (diff)
parentad5e350ab764f3a420d29f24ab3222f671b2e8c0 (diff)
downloademacs-56ce263f506fede328888a321a12b1f85f46d0d5.tar.gz
emacs-56ce263f506fede328888a321a12b1f85f46d0d5.tar.bz2
emacs-56ce263f506fede328888a321a12b1f85f46d0d5.zip
Merge from origin/emacs-27
ad5e350ab7 c-end-of-macro: Handle block coment lines with unescaped N... 06c302d425 Fix set-fontset-font with ADD arg non-nil 530067463b Correct "different than" to "different from" where appropr... 56b8768b32 More accurate documentation of 'package-menu-hide-package'
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/gv.el2
-rw-r--r--lisp/emacs-lisp/package.el7
2 files changed, 5 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el
index 92241a7d566..b43e53b9d27 100644
--- a/lisp/emacs-lisp/gv.el
+++ b/lisp/emacs-lisp/gv.el
@@ -24,7 +24,7 @@
;;; Commentary:
;; This is a re-implementation of the setf machinery using a different
-;; underlying approach than the one used earlier in CL, which was based on
+;; underlying approach from the one used earlier in CL, which was based on
;; define-setf-expander.
;; `define-setf-expander' makes every "place-expander" return a 5-tuple
;; (VARS VALUES STORES GETTER SETTER)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index f14ef7919ea..c4f751871b6 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2724,7 +2724,7 @@ either a full name or nil, and EMAIL is a valid email address."
["Filter by Version" package-menu-filter-by-version :help "Filter packages by version"]
["Clear Filter" package-menu-clear-filter :help "Clear package list filter"])
- ["Hide by Regexp" package-menu-hide-package :help "Permanently hide all packages matching a regexp"]
+ ["Hide by Regexp" package-menu-hide-package :help "Hide all packages matching a regexp"]
["Display Older Versions" package-menu-toggle-hiding
:style toggle :selected (not package-menu--hide-packages)
:help "Display package even if a newer version is already installed"]
@@ -3189,8 +3189,9 @@ function. The args ARG and NOCONFIRM, passed from
(define-obsolete-function-alias 'package-menu-refresh 'revert-buffer "27.1")
(defun package-menu-hide-package ()
- "Hide a package under point in Package Menu.
-If optional arg BUTTON is non-nil, describe its associated package."
+ "Hide in Package Menu packages that match a regexp.
+Prompts for the regexp to match against package names.
+The default regexp will hide only the package whose name is at point."
(interactive)
(package--ensure-package-menu-mode)
(declare (interactive-only "change `package-hidden-regexps' instead."))