aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
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 @@
12012-05-01 Glenn Morris <rgm@gnu.org> 12012-05-01 Glenn Morris <rgm@gnu.org>
2 2
3 * dispnew.c: Remove HAVE_LIBNCURSES test;
4 it is always true on relevant platforms.
5
3 * Makefile.in (LD_SWITCH_X_SITE_RPATH): 6 * Makefile.in (LD_SWITCH_X_SITE_RPATH):
4 Rename from LD_SWITCH_X_SITE_AUX_RPATH. 7 Rename from LD_SWITCH_X_SITE_AUX_RPATH.
5 8
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 @@
1/* Updating of data structures for redisplay. 1/* Updating of data structures for redisplay.
2 Copyright (C) 1985-1988, 1993-1995, 1997-2012 Free Software Foundation, Inc. 2
3Copyright (C) 1985-1988, 1993-1995, 1997-2012 Free Software Foundation, Inc.
3 4
4This file is part of GNU Emacs. 5This file is part of GNU Emacs.
5 6
@@ -87,7 +88,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
87#endif 88#endif
88#endif /* not __GNU_LIBRARY__ */ 89#endif /* not __GNU_LIBRARY__ */
89 90
90#if defined (HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES) 91#if defined (HAVE_TERM_H) && defined (GNU_LINUX)
91#include <term.h> /* for tgetent */ 92#include <term.h> /* for tgetent */
92#endif 93#endif
93 94
@@ -6303,7 +6304,7 @@ init_display (void)
6303#ifdef HAVE_X11 6304#ifdef HAVE_X11
6304 Vwindow_system_version = make_number (11); 6305 Vwindow_system_version = make_number (11);
6305#endif 6306#endif
6306#if defined (GNU_LINUX) && defined (HAVE_LIBNCURSES) 6307#ifdef GNU_LINUX
6307 /* In some versions of ncurses, 6308 /* In some versions of ncurses,
6308 tputs crashes if we have not called tgetent. 6309 tputs crashes if we have not called tgetent.
6309 So call tgetent. */ 6310 So call tgetent. */