2015-12-05 Chris Allegretta <chrisa@asty.org>

	* src/nano.c (main) : key_defined() is an ncurses-ism.  Add
	better checks for this.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5482 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 6dea6e2eee1269d0c2d54aa654d411d53cfd1300..c9ac861c8f00113a0ce5af472468fd7e8b877c07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-05  Chris Allegretta <chrisa@asty.org>
+       * src/nano.c (main) : key_defined() is an ncurses-ism.  Add
+       better checks for this.
+
 2015-12-05  Benno Schulenberg  <bensberg@justemail.net>
        * src/text.c: Fix compilation with --enable-tiny --enable-justify.
        * doc/man/{nano.1,rnano.1,nanorc.5}, doc/texinfo/nano.texi:

diff --git a/configure.ac b/configure.ac
index c19fdc2624d2d5aeed57ca32e38b7004f095156d..afc57005b20a32d171cfc536a86bd935055b6bae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -527,6 +527,7 @@ else
 fi
 
 AC_CHECK_LIB([$CURSES_LIB_NAME], use_default_colors, AC_DEFINE(HAVE_USE_DEFAULT_COLORS, 1, [Define this if your curses library has the use_default_colors() command.]))
+AC_CHECK_LIB([$CURSES_LIB_NAME], key_defined, AC_DEFINE(HAVE_KEY_DEFINED, 1, [Define this if your curses library has the key_defined() command.]))
 
 dnl Parse any configure options.
 

diff --git a/src/nano.c b/src/nano.c
index 682ef1e2115afe6368297ffdfff7c4087d96f12f..b795fe9f2886f9841fc29f49617fdc610e0ba72b 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -2706,7 +2706,7 @@ int main(int argc, char **argv)
     interface_color_pair[FUNCTION_TAG].bright = FALSE;
 #endif
 
-#if !defined(NANO_TINY) && !defined(USE_SLANG)
+#if !defined(NANO_TINY) && defined(HAVE_KEY_DEFINED)
     /* Ask ncurses for the key codes for Control+Left and Control+Right. */
     if ((int)tigetstr("kLFT5") > 0)
        controlleft = key_defined(tigetstr("kLFT5"));