diff options
author | Chong Yidong <cyd@gnu.org> | 2012-05-31 14:08:06 +0800 |
---|---|---|
committer | Chong Yidong <cyd@gnu.org> | 2012-05-31 14:08:06 +0800 |
commit | efc00ab16e2890b75d7224434ac43fe944ade4dd (patch) | |
tree | 28c1078ca32b96402cd1a5f618a17b3526143f27 /src/keymap.c | |
parent | ba93a18774352c97d6dd73c73141cbff6305581b (diff) | |
parent | dd41169b6cb0105b0766f3d368c657ebafc19cba (diff) | |
download | emacs-efc00ab16e2890b75d7224434ac43fe944ade4dd.tar.gz |
Merge from emacs-24; up to 2012-04-24T21:47:24Z!michael.albinus@gmx.de
Diffstat (limited to 'src/keymap.c')
-rw-r--r-- | src/keymap.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/keymap.c b/src/keymap.c index 2a03dda5a5e..2f5558c171f 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -2996,9 +2996,9 @@ You type Translation\n\ If MENTION_SHADOW is nonzero, then when something is shadowed by SHADOW, don't omit it; instead, mention it but say it is shadowed. - Return whether something was inserted or not. */ + Any inserted text ends in two newlines (used by `help-make-xrefs'). */ -int +void describe_map_tree (Lisp_Object startmap, int partial, Lisp_Object shadow, Lisp_Object prefix, const char *title, int nomenu, int transl, int always_title, int mention_shadow) @@ -3108,8 +3108,10 @@ key binding\n\ skip: ; } + if (something) + insert_string ("\n"); + UNGCPRO; - return something; } static int previous_description_column; |