Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-144
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-145
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-146
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-147
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-148
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-149
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-150
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-151
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-152
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-56
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-57
   Copy/update icons from Gnus trunk

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-530

1 files changed, 1 insertions, 1 deletions

diff --git a/src/keymap.c b/src/keymap.c
index ca8edab122b..fc7b23f6302 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -3364,7 +3364,7 @@ describe_map (map, prefix, elt_describer, partial, shadow,
       if (vect[i].shadowed)
         {
           SET_PT (PT - 1);
-          insert_string ("  (binding currently shadowed)");
+          insert_string ("  (shadowed)");
           SET_PT (PT + 1);
         }
     }