summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-03-19 16:49:55 +0000
committerAndrea Corallo <akrl@sdf.org>2020-03-19 16:49:55 +0000
commit981cc1575096849f70bc381e096ac5ba274a2c2f (patch)
treed6ff833bd1b446ea0a3a2ced2f9e235d97a97778 /lisp/emacs-lisp
parentb070571f93def7892b71a711a59bbd065c554897 (diff)
parent0128375a50352720c626fd915312a5c38762d09a (diff)
downloademacs-981cc1575096849f70bc381e096ac5ba274a2c2f.tar.gz
emacs-981cc1575096849f70bc381e096ac5ba274a2c2f.tar.bz2
emacs-981cc1575096849f70bc381e096ac5ba274a2c2f.zip
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/package.el20
1 files changed, 16 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 07d63b3a7dc..f5a9055b5b7 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2861,7 +2861,11 @@ Can be toggled with \\<package-menu-mode-map> \\[package-menu-toggle-hiding].
Installed obsolete packages are always displayed.")
(defun package-menu-toggle-hiding ()
- "In Package Menu, toggle visibility of obsolete available packages."
+ "In Package Menu, toggle visibility of obsolete available packages.
+
+Also hide packages whose name matches a regexp in user option
+`package-hidden-regexps' (a list). To add regexps to this list,
+use `package-menu-hide-package'."
(interactive)
(package--ensure-package-menu-mode)
(setq package-menu--hide-packages
@@ -3191,8 +3195,16 @@ function. The args ARG and NOCONFIRM, passed from
(defun package-menu-hide-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."
+Prompt for the regexp to match against package names.
+The default regexp will hide only the package whose name is at point.
+
+The regexp is added to the list in the user option
+`package-hidden-regexps' and saved for future sessions.
+
+To unhide a package, type
+`\\[customize-variable] RET package-hidden-regexps'.
+
+Type \\[package-menu-toggle-hiding] to toggle package hiding."
(interactive)
(package--ensure-package-menu-mode)
(declare (interactive-only "change `package-hidden-regexps' instead."))
@@ -3211,7 +3223,7 @@ The default regexp will hide only the package whose name is at point."
package-archive-contents)))
(message "Packages to hide: %d. Type `%s' to toggle or `%s' to customize"
(length hidden)
- (substitute-command-keys "\\[package-menu-toggle-hidding]")
+ (substitute-command-keys "\\[package-menu-toggle-hiding]")
(substitute-command-keys "\\[customize-variable] RET package-hidden-regexps")))))