diff options
| author | Glenn Morris | 2021-01-04 07:50:25 -0800 |
|---|---|---|
| committer | Glenn Morris | 2021-01-04 07:50:25 -0800 |
| commit | 1395fb8ff7c7e55bc7f5d3c901cb45bd0b3c7c8f (patch) | |
| tree | c3a3d49d2fc678782b42e233ea8e8b94ad491d55 /src | |
| parent | e8bf7258ae4ef2bfe2c4e09cb00516dd4ccbe214 (diff) | |
| parent | 2e09efdb6877a2c189385be45d4cdceb617b6c5d (diff) | |
| download | emacs-1395fb8ff7c7e55bc7f5d3c901cb45bd0b3c7c8f.tar.gz emacs-1395fb8ff7c7e55bc7f5d3c901cb45bd0b3c7c8f.zip | |
Merge from origin/emacs-27
2e09efdb68 Revert previous patch which was installed into wrong branch.
Diffstat (limited to 'src')
| -rw-r--r-- | src/terminfo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/terminfo.c b/src/terminfo.c index a9c9572bbb2..15aff317f15 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/>. */ | |||
| 23 | 23 | ||
| 24 | /* Define these variables that serve as global parameters to termcap, | 24 | /* Define these variables that serve as global parameters to termcap, |
| 25 | so that we do not need to conditionalize the places in Emacs | 25 | so that we do not need to conditionalize the places in Emacs |
| 26 | that set them. But don't do that if terminfo defines them, as that | 26 | that set them. But don't do that for terminfo, as that could |
| 27 | could cause link errors when using -fno-common. */ | 27 | cause link errors when using -fno-common. */ |
| 28 | 28 | ||
| 29 | #ifndef TERMINFO_DEFINES_BC | 29 | #if !TERMINFO |
| 30 | char *UP, *BC, PC; | 30 | char *UP, *BC, PC; |
| 31 | #endif | 31 | #endif |
| 32 | 32 | ||