[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-27 2e09efd: Revert previous patch which was installed into wrong b
From: |
Paul Eggert |
Subject: |
emacs-27 2e09efd: Revert previous patch which was installed into wrong branch. |
Date: |
Sun, 3 Jan 2021 14:58:46 -0500 (EST) |
branch: emacs-27
commit 2e09efdb6877a2c189385be45d4cdceb617b6c5d
Author: Paul Eggert <eggert@cs.ucla.edu>
Commit: Paul Eggert <eggert@cs.ucla.edu>
Revert previous patch which was installed into wrong branch.
---
configure.ac | 12 ------------
src/terminfo.c | 6 +++---
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/configure.ac b/configure.ac
index 89b0785..48e9652 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4366,18 +4366,6 @@ TERMCAP_OBJ=tparam.o
if test $TERMINFO = yes; then
AC_DEFINE(TERMINFO, 1, [Define to 1 if you use terminfo instead of termcap.])
TERMCAP_OBJ=terminfo.o
- AC_CACHE_CHECK([whether $LIBS_TERMCAP library defines BC],
- [emacs_cv_terminfo_defines_BC],
- [OLD_LIBS=$LIBS
- LIBS="$LIBS $LIBS_TERMCAP"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern char *BC;]], [[return !*BC;]])],
- [emacs_cv_terminfo_defines_BC=yes],
- [emacs_cv_terminfo_defines_BC=no])
- LIBS=$OLD_LIBS])
- if test "$emacs_cv_terminfo_defines_BC" = yes; then
- AC_DEFINE([TERMINFO_DEFINES_BC], 1, [Define to 1 if the
- terminfo library defines the variables BC, PC, and UP.])
- fi
fi
if test "X$LIBS_TERMCAP" = "X-lncurses"; then
AC_DEFINE(USE_NCURSES, 1, [Define to 1 if you use ncurses.])
diff --git a/src/terminfo.c b/src/terminfo.c
index a9c9572..15aff31 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -23,10 +23,10 @@ along with GNU Emacs. If not, see
<https://www.gnu.org/licenses/>. */
/* Define these variables that serve as global parameters to termcap,
so that we do not need to conditionalize the places in Emacs
- that set them. But don't do that if terminfo defines them, as that
- could cause link errors when using -fno-common. */
+ that set them. But don't do that for terminfo, as that could
+ cause link errors when using -fno-common. */
-#ifndef TERMINFO_DEFINES_BC
+#if !TERMINFO
char *UP, *BC, PC;
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-27 2e09efd: Revert previous patch which was installed into wrong branch.,
Paul Eggert <=