aboutsummaryrefslogtreecommitdiffstats
path: root/src/keymap.c
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-07 19:19:10 +0200
committerLars Magne Ingebrigtsen2011-07-07 19:19:10 +0200
commit9888ff71e38a45c471074bf270be90cd5280ec49 (patch)
treeaf4c0d456286c8fb2004e6489e660144b048d765 /src/keymap.c
parent54e101844312f87d5283db5fd078d0756264caa2 (diff)
downloademacs-9888ff71e38a45c471074bf270be90cd5280ec49.tar.gz
emacs-9888ff71e38a45c471074bf270be90cd5280ec49.zip
(describe_map_tree): Don't insert a double newline at the end of the string
Return whether we inserted something. This should allow the caller to decide whether to insert more newlines or not. Fixes: debbugs:1169
Diffstat (limited to 'src/keymap.c')
-rw-r--r--src/keymap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/keymap.c b/src/keymap.c
index be31f72eec6..d33af68be48 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2951,9 +2951,11 @@ You type Translation\n\
2951 to look through. 2951 to look through.
2952 2952
2953 If MENTION_SHADOW is nonzero, then when something is shadowed by SHADOW, 2953 If MENTION_SHADOW is nonzero, then when something is shadowed by SHADOW,
2954 don't omit it; instead, mention it but say it is shadowed. */ 2954 don't omit it; instead, mention it but say it is shadowed.
2955 2955
2956void 2956 Return whether something was inserted or not. */
2957
2958int
2957describe_map_tree (Lisp_Object startmap, int partial, Lisp_Object shadow, 2959describe_map_tree (Lisp_Object startmap, int partial, Lisp_Object shadow,
2958 Lisp_Object prefix, const char *title, int nomenu, int transl, 2960 Lisp_Object prefix, const char *title, int nomenu, int transl,
2959 int always_title, int mention_shadow) 2961 int always_title, int mention_shadow)
@@ -3063,10 +3065,8 @@ key binding\n\
3063 skip: ; 3065 skip: ;
3064 } 3066 }
3065 3067
3066 if (something)
3067 insert_string ("\n");
3068
3069 UNGCPRO; 3068 UNGCPRO;
3069 return something;
3070} 3070}
3071 3071
3072static int previous_description_column; 3072static int previous_description_column;