Commit a29c3e6d authored by Paul Eggert's avatar Paul Eggert
Browse files

Port to GNU/Linux systems with tinfo but not ncurses.

* configure.ac (USE_NCURSES): New symbol.
* src/dispnew.c (init_display): Depend on USE_NCURSES, not GNU_LINUX,
to decide whether ncurses is being used.  Without this change,
GCC complains about tgetent not being declared, on a system
that has tinfo installed but ncurses not installed.
parent f274311c
2013-07-23 Paul Eggert <eggert@cs.ucla.edu>
Port to Ubuntu 12.04 with tinfo but not ncurses.
* configure.ac (USE_NCURSES): New symbol.
2013-07-20 Paul Eggert <eggert@cs.ucla.edu> 2013-07-20 Paul Eggert <eggert@cs.ucla.edu>
Fix array bounds violation when pty allocation fails. Fix array bounds violation when pty allocation fails.
......
...@@ -3406,6 +3406,9 @@ if test $TERMINFO = yes; then ...@@ -3406,6 +3406,9 @@ if test $TERMINFO = yes; then
AC_DEFINE(TERMINFO, 1, [Define to 1 if you use terminfo instead of termcap.]) AC_DEFINE(TERMINFO, 1, [Define to 1 if you use terminfo instead of termcap.])
TERMCAP_OBJ=terminfo.o TERMCAP_OBJ=terminfo.o
fi fi
if test "X$LIBS_TERMCAP" = "X-lncurses"; then
AC_DEFINE(USE_NCURSES, 1, [Define to 1 if you use ncurses.])
fi
AC_SUBST(LIBS_TERMCAP) AC_SUBST(LIBS_TERMCAP)
AC_SUBST(TERMCAP_OBJ) AC_SUBST(TERMCAP_OBJ)
......
2013-07-23 Paul Eggert <eggert@cs.ucla.edu> 2013-07-23 Paul Eggert <eggert@cs.ucla.edu>
Port to GNU/Linux systems with tinfo but not ncurses.
* dispnew.c (init_display): Depend on USE_NCURSES, not GNU_LINUX,
to decide whether ncurses is being used. Without this change,
GCC complains about tgetent not being declared, on a system
that has tinfo installed but ncurses not installed.
* eval.c (Fprogn): Check that BODY is a proper list. * eval.c (Fprogn): Check that BODY is a proper list.
Tune UNEVALLED functions by using XCAR instead of Fcar, etc. Tune UNEVALLED functions by using XCAR instead of Fcar, etc.
......
...@@ -6041,7 +6041,7 @@ init_display (void) ...@@ -6041,7 +6041,7 @@ init_display (void)
#ifdef HAVE_X11 #ifdef HAVE_X11
Vwindow_system_version = make_number (11); Vwindow_system_version = make_number (11);
#endif #endif
#ifdef GNU_LINUX #ifdef USE_NCURSES
/* In some versions of ncurses, /* In some versions of ncurses,
tputs crashes if we have not called tgetent. tputs crashes if we have not called tgetent.
So call tgetent. */ So call tgetent. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment