Fixing compilation with --disable-utf8.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4690 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
Этот коммит содержится в:
родитель
c55ac2bb4d
Коммит
cf71578cfd
@ -1,3 +1,6 @@
|
|||||||
|
2014-03-27 Benno Schulenberg <bensberg@justemail.net>
|
||||||
|
* src/nano.c (main) - Fix compilation with --disable-utf8.
|
||||||
|
|
||||||
2014-03-27 Mike Frysinger <vapier@gentoo.org>.
|
2014-03-27 Mike Frysinger <vapier@gentoo.org>.
|
||||||
* configure.ac - Make --disable-nanorc with --enable-color barf.
|
* configure.ac - Make --disable-nanorc with --enable-color barf.
|
||||||
* configure.ac - Allow --disable-utf8 and --enable-utf8 to work.
|
* configure.ac - Allow --disable-utf8 and --enable-utf8 to work.
|
||||||
|
@ -2563,11 +2563,14 @@ int main(int argc, char **argv)
|
|||||||
#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
|
#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
|
||||||
/* If whitespace wasn't specified, set its default value. */
|
/* If whitespace wasn't specified, set its default value. */
|
||||||
if (whitespace == NULL) {
|
if (whitespace == NULL) {
|
||||||
|
#ifdef ENABLE_UTF8
|
||||||
if (using_utf8()) {
|
if (using_utf8()) {
|
||||||
whitespace = mallocstrcpy(NULL, "»·");
|
whitespace = mallocstrcpy(NULL, "»·");
|
||||||
whitespace_len[0] = 2;
|
whitespace_len[0] = 2;
|
||||||
whitespace_len[1] = 2;
|
whitespace_len[1] = 2;
|
||||||
} else {
|
} else
|
||||||
|
#endif
|
||||||
|
{
|
||||||
whitespace = mallocstrcpy(NULL, ">.");
|
whitespace = mallocstrcpy(NULL, ">.");
|
||||||
whitespace_len[0] = 1;
|
whitespace_len[0] = 1;
|
||||||
whitespace_len[1] = 1;
|
whitespace_len[1] = 1;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user