Commit 9888ff71 authored by Lars Magne Ingebrigtsen's avatar Lars Magne Ingebrigtsen
Browse files

(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
parent 54e10184
2011-07-07 Lars Magne Ingebrigtsen <larsi@gnus.org> 2011-07-07 Lars Magne Ingebrigtsen <larsi@gnus.org>
* keymap.c (describe_map_tree): Don't insert a double newline at
the end of the buffer (bug#1169) and return whether we inserted
something.
* callint.c (Fcall_interactively): Change "reading args" to * callint.c (Fcall_interactively): Change "reading args" to
"providing args" to try to clarify what it does (bug#1010). "providing args" to try to clarify what it does (bug#1010).
......
...@@ -2951,9 +2951,11 @@ You type Translation\n\ ...@@ -2951,9 +2951,11 @@ You type Translation\n\
to look through. to look through.
If MENTION_SHADOW is nonzero, then when something is shadowed by SHADOW, If MENTION_SHADOW is nonzero, then when something is shadowed by SHADOW,
don't omit it; instead, mention it but say it is shadowed. */ don't omit it; instead, mention it but say it is shadowed.
void Return whether something was inserted or not. */
int
describe_map_tree (Lisp_Object startmap, int partial, Lisp_Object shadow, describe_map_tree (Lisp_Object startmap, int partial, Lisp_Object shadow,
Lisp_Object prefix, const char *title, int nomenu, int transl, Lisp_Object prefix, const char *title, int nomenu, int transl,
int always_title, int mention_shadow) int always_title, int mention_shadow)
...@@ -3063,10 +3065,8 @@ key binding\n\ ...@@ -3063,10 +3065,8 @@ key binding\n\
skip: ; skip: ;
} }
if (something)
insert_string ("\n");
UNGCPRO; UNGCPRO;
return something;
} }
static int previous_description_column; static int previous_description_column;
......
...@@ -36,8 +36,8 @@ EXFUN (Fcurrent_active_maps, 2); ...@@ -36,8 +36,8 @@ EXFUN (Fcurrent_active_maps, 2);
extern Lisp_Object access_keymap (Lisp_Object, Lisp_Object, int, int, int); extern Lisp_Object access_keymap (Lisp_Object, Lisp_Object, int, int, int);
extern Lisp_Object get_keymap (Lisp_Object, int, int); extern Lisp_Object get_keymap (Lisp_Object, int, int);
EXFUN (Fset_keymap_parent, 2); EXFUN (Fset_keymap_parent, 2);
extern void describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object, extern int describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object,
const char *, int, int, int, int); const char *, int, int, int, int);
extern int current_minor_maps (Lisp_Object **, Lisp_Object **); extern int current_minor_maps (Lisp_Object **, Lisp_Object **);
extern void initial_define_key (Lisp_Object, int, const char *); extern void initial_define_key (Lisp_Object, int, const char *);
extern void initial_define_lispy_key (Lisp_Object, const char *, const char *); extern void initial_define_lispy_key (Lisp_Object, const char *, const char *);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment