From 4ac129c4bff94108a4e2147c67aff069dccf48b6 Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Wed, 19 Jul 2006 19:40:54 +0000
Subject: [PATCH] when using slang 2.x, call SLutf8_enable() with an argument
of 1 instead of TRUE, as that's the proper way to force its UTF-8 support on
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3799 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 3 +++
configure.ac | 6 +++---
src/nano.c | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2ccb2b47..8f9d3599 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,9 @@ CVS code -
edit_scroll(). (DLR, found by Daniel Richard G.)
- Rename the DISABLE_ROOTWRAP #define to DISABLE_ROOTWRAPPING.
(DLR)
+ - When using slang 2.x, call SLutf8_enable() with an argument of
+ 1 instead of TRUE, as that's the proper way to force its UTF-8
+ support on. Changes to main() and configure.ac. (DLR)
- browser.c:
do_browser()
- Refactor the mouse support, modeling it after do_mouse() for
diff --git a/configure.ac b/configure.ac
index 972f064e..1f0c5f0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,7 +210,7 @@ AC_ARG_WITH(slang,
#include <slcurses.h>
int main(void)
{
- SLutf8_enable(TRUE);
+ SLutf8_enable(1);
return 0;
}],
[AC_MSG_RESULT(yes)
@@ -236,7 +236,7 @@ int main(void)
#include <slcurses.h>
int main(void)
{
- SLutf8_enable(TRUE);
+ SLutf8_enable(1);
return 0;
}],
[AC_MSG_RESULT(yes)
@@ -257,7 +257,7 @@ int main(void)
#include <slcurses.h>
int main(void)
{
- SLutf8_enable(TRUE);
+ SLutf8_enable(1);
return 0;
}],
[AC_MSG_RESULT(yes)
diff --git a/src/nano.c b/src/nano.c
index 0b4b0cfe..3ca9632a 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1728,7 +1728,7 @@ int main(int argc, char **argv)
if (locale != NULL && (strcasestr(locale, "UTF8") != NULL ||
strcasestr(locale, "UTF-8") != NULL)) {
#ifdef USE_SLANG
- SLutf8_enable(TRUE);
+ SLutf8_enable(1);
#endif
utf8_init();
}
--
GitLab