summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-04-30 20:30:11 -0400
committerGlenn Morris <rgm@gnu.org>2012-04-30 20:30:11 -0400
commit9311dcff1de585f39b16e07fbc5a9fb681a06642 (patch)
treec088999761bf51c27cfbb4c005509654f3a1f7c7 /src
parent6eac8dc9ac4a6478b88a397a876c272b16c0facc (diff)
downloademacs-9311dcff1de585f39b16e07fbc5a9fb681a06642.tar.gz
Remove HAVE_LIBNCURSES; it is required to be true
Also, it was a confusing name, since it does not necessarily mean that we literally have libncurses; rather that we have tputs etc. * configure.in (HAVE_LIBNCURSES): Remove; it is required to be true. * src/dispnew.c: Remove HAVE_LIBNCURSES test; it is always true on relevant platforms. * nt/config.nt (HAVE_LIBNCURSES): Remove undef; not needed.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/dispnew.c7
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f1e175a968d..c02d919a2e2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
2012-05-01 Glenn Morris <rgm@gnu.org>
+ * dispnew.c: Remove HAVE_LIBNCURSES test;
+ it is always true on relevant platforms.
+
* Makefile.in (LD_SWITCH_X_SITE_RPATH):
Rename from LD_SWITCH_X_SITE_AUX_RPATH.
diff --git a/src/dispnew.c b/src/dispnew.c
index b313852efe2..a50877a6a90 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1,5 +1,6 @@
/* Updating of data structures for redisplay.
- Copyright (C) 1985-1988, 1993-1995, 1997-2012 Free Software Foundation, Inc.
+
+Copyright (C) 1985-1988, 1993-1995, 1997-2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -87,7 +88,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif
#endif /* not __GNU_LIBRARY__ */
-#if defined (HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES)
+#if defined (HAVE_TERM_H) && defined (GNU_LINUX)
#include <term.h> /* for tgetent */
#endif
@@ -6303,7 +6304,7 @@ init_display (void)
#ifdef HAVE_X11
Vwindow_system_version = make_number (11);
#endif
-#if defined (GNU_LINUX) && defined (HAVE_LIBNCURSES)
+#ifdef GNU_LINUX
/* In some versions of ncurses,
tputs crashes if we have not called tgetent.
So call tgetent. */