mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 19:10:37 -08:00
Code Issues Projects Releases Wiki Activity

Revert previous patch which was installed into wrong branch.

Browse source
This commit is contained in:
Paul Eggert 2021-01-03 11:58:34 -08:00
parent 585997d05a
commit 2e09efdb68
2 changed files with 3 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -4366,18 +4366,6 @@ TERMCAP_OBJ=tparam.o
if test $TERMINFO = yes; then 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
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 fi
if test "X$LIBS_TERMCAP" = "X-lncurses"; then if test "X$LIBS_TERMCAP" = "X-lncurses"; then
AC_DEFINE(USE_NCURSES, 1, [Define to 1 if you use ncurses.]) AC_DEFINE(USE_NCURSES, 1, [Define to 1 if you use ncurses.])

6
src/terminfo.c
View file

@ -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, /* Define these variables that serve as global parameters to termcap,
so that we do not need to conditionalize the places in Emacs 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 that set them. But don't do that for terminfo, as that could
could cause link errors when using -fno-common. */ cause link errors when using -fno-common. */
#ifndef TERMINFO_DEFINES_BC #if !TERMINFO
char *UP, *BC, PC; char *UP, *BC, PC;
#endif #endif