aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrew Adams2011-06-27 02:29:55 +0200
committerJuanma Barranquero2011-06-27 02:29:55 +0200
commit7c823eab820935bf7d3c87c7f08b6a18dbbedbb4 (patch)
treefd0617288f55a9739c9d16247a2d420db79ccaa7
parentf6ab314e6ed2e3ad335fde222e6b649ead481040 (diff)
downloademacs-7c823eab820935bf7d3c87c7f08b6a18dbbedbb4.tar.gz
emacs-7c823eab820935bf7d3c87c7f08b6a18dbbedbb4.zip
lisp/faces.el (list-faces-display): Add help-mode-map to output.
Fixes: debbugs:8939
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/faces.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 872b4945837..ee8c301dbcd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,6 +8,10 @@
8 to binary to possibly avoid line encoding issues on Windows (among 8 to binary to possibly avoid line encoding issues on Windows (among
9 other things). 9 other things).
10 10
112011-06-27 Drew Adams <drew.adams@oracle.com>
12
13 * faces.el (list-faces-display): Add help-mode-map to output (bug#8939).
14
112011-06-26 Lars Magne Ingebrigtsen <larsi@gnus.org> 152011-06-26 Lars Magne Ingebrigtsen <larsi@gnus.org>
12 16
13 * net/network-stream.el (open-network-stream): Return an :error 17 * net/network-stream.el (open-network-stream): Return an :error
diff --git a/lisp/faces.el b/lisp/faces.el
index 3fb8bc80931..c29d8c9bfd8 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1255,7 +1255,7 @@ arg, prompt for a regular expression."
1255 (insert 1255 (insert
1256 (substitute-command-keys 1256 (substitute-command-keys
1257 (concat 1257 (concat
1258 "Use " 1258 "\\<help-mode-map>>Use "
1259 (if (display-mouse-p) "\\[help-follow-mouse] or ") 1259 (if (display-mouse-p) "\\[help-follow-mouse] or ")
1260 "\\[help-follow] on a face name to customize it\n" 1260 "\\[help-follow] on a face name to customize it\n"
1261 "or on its sample text for a description of the face.\n\n"))) 1261 "or on its sample text for a description of the face.\n\n")))