From c9b7c53a8263f5433b08ca6b824daaf064397704 Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Wed, 6 Apr 1994 02:07:40 +0000 Subject: [PATCH] (describe_buffer_bindings): Move XSYMBOL to after SYMBOLP. Exclude trailing null in string copies. --- src/keymap.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/keymap.c b/src/keymap.c index 1c403dcf234..f6e5b443fe2 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1807,15 +1807,15 @@ nominal alternate\n\ /* Print the minor mode maps. */ for (i = 0; i < nmaps; i++) { - /* Tht title for a minor mode keymap + /* The title for a minor mode keymap is constructed at run time. We let describe_map_tree do the actual insertion because it takes care of other features when doing so. */ - char *title = (char *) alloca (40 + XSYMBOL (modes[i])->name->size); - char *p = title; + char *title, *p; if (XTYPE (modes[i]) == Lisp_Symbol) { + p = title = (char *) alloca (40 + XSYMBOL (modes[i])->name->size); *p++ = '`'; bcopy (XSYMBOL (modes[i])->name->data, p, XSYMBOL (modes[i])->name->size); @@ -1824,11 +1824,12 @@ nominal alternate\n\ } else { - bcopy ("Strangely Named", p, sizeof ("Strangely Named")); - p += sizeof ("Strangely Named"); + p = title = (char *) alloca (40 + 20); + bcopy ("Strangely Named", p, sizeof ("Strangely Named") - 1); + p += sizeof ("Strangely Named") - 1; } - bcopy (" Minor Mode Bindings", p, sizeof (" Minor Mode Bindings")); - p += sizeof (" Minor Mode Bindings"); + bcopy (" Minor Mode Bindings", p, sizeof (" Minor Mode Bindings") - 1); + p += sizeof (" Minor Mode Bindings") - 1; *p = 0; describe_map_tree (maps[i], 0, shadow, prefix, title, 0); -- 2.39.5