diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-07-07 19:19:10 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-07-07 19:19:10 +0200 |
| commit | 9888ff71e38a45c471074bf270be90cd5280ec49 (patch) | |
| tree | af4c0d456286c8fb2004e6489e660144b048d765 | |
| parent | 54e101844312f87d5283db5fd078d0756264caa2 (diff) | |
| download | emacs-9888ff71e38a45c471074bf270be90cd5280ec49.tar.gz | |
(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
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/keymap.c | 10 | ||||
| -rw-r--r-- | src/keymap.h | 4 |
3 files changed, 11 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8c1af2a27ce..4cacc677c23 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 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 "providing args" to try to clarify what it does (bug#1010). 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\ to look through. 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, Lisp_Object prefix, const char *title, int nomenu, int transl, int always_title, int mention_shadow) @@ -3063,10 +3065,8 @@ key binding\n\ skip: ; } - if (something) - insert_string ("\n"); - UNGCPRO; + return something; } static int previous_description_column; diff --git a/src/keymap.h b/src/keymap.h index 2b9d58b39dc..2c826b64e1f 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -36,8 +36,8 @@ EXFUN (Fcurrent_active_maps, 2); extern Lisp_Object access_keymap (Lisp_Object, Lisp_Object, int, int, int); extern Lisp_Object get_keymap (Lisp_Object, int, int); EXFUN (Fset_keymap_parent, 2); -extern void describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object, - const char *, int, int, int, int); +extern int describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object, + const char *, int, int, int, int); extern int current_minor_maps (Lisp_Object **, Lisp_Object **); extern void initial_define_key (Lisp_Object, int, const char *); extern void initial_define_lispy_key (Lisp_Object, const char *, const char *); |