From 631242dd96dfbfeaf10b01a1c8370790a53bcf28 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Tue, 15 Mar 2005 07:06:54 +0000 Subject: [PATCH] a few last minor fixes to do_credits() git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2374 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- src/chars.c | 2 +- src/proto.h | 2 +- src/winio.c | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/chars.c b/src/chars.c index 6da82e92..8080b775 100644 --- a/src/chars.c +++ b/src/chars.c @@ -301,7 +301,7 @@ char *make_mbchar(int chr, int *chr_mb_len) return chr_mb; } -#ifdef ENABLE_NANORC +#if defined(ENABLE_NANORC) || defined(ENABLE_EXTRA) /* Convert the string str to a valid multibyte string with the same wide * character values as str. Return the (dynamically allocated) * multibyte string. */ diff --git a/src/proto.h b/src/proto.h index f5780014..a976c22a 100644 --- a/src/proto.h +++ b/src/proto.h @@ -175,7 +175,7 @@ wchar_t control_wrep(wchar_t c); int mbwidth(const char *c); int mb_cur_max(void); char *make_mbchar(int chr, int *chr_mb_len); -#ifdef ENABLE_NANORC +#if defined(ENABLE_NANORC) || defined(ENABLE_EXTRA) char *make_mbstring(const char *str); #endif int parse_mbchar(const char *buf, char *chr, bool *bad_chr, size_t diff --git a/src/winio.c b/src/winio.c index 6a667df9..440b6c55 100644 --- a/src/winio.c +++ b/src/winio.c @@ -4123,6 +4123,9 @@ void do_credits(void) char *what; size_t start_x; + /* Make sure every credit is a valid multibyte string, since + * we can't dynamically set the credits to their multibyte + * equivalents when we need to. Sigh... */ if (credits[crpos] == NULL) { assert(0 <= xlpos && xlpos < XLCREDIT_LEN); -- 2.39.5