diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-09-11 01:24:05 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-09-11 01:24:05 -0700 |
| commit | 73f82c7e8eb6a009248f4ea6360b2182d06f55e2 (patch) | |
| tree | 72a9eddac1e2c9c1db8a62b97031f72d53b66140 /src/termchar.h | |
| parent | 53482f41157f37a7f6afb7f19be8fc63b015f6ed (diff) | |
| download | emacs-73f82c7e8eb6a009248f4ea6360b2182d06f55e2.tar.gz | |
Fix corruption with multiple emacsclient -t instances.
This bug was introduced by my 2013-08-26 patch, which incorrectly
assumed that the terminfo implementation doesn't use termcap buffers.
* term.c (init_tty) [TERMINFO]: Remove optimization, as
these buffers apparently are used after all.
* termchar.h (TERMCAP_BUFFER_SIZE) [TERMINFO]: Define here too.
(struct tty_display_info): Define members termcap_term_buffer and
termcap_strings_buffer even if TERMINFO.
Fixes: debbugs:15222
Diffstat (limited to 'src/termchar.h')
| -rw-r--r-- | src/termchar.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/termchar.h b/src/termchar.h index 687f7fbd119..11cea34df23 100644 --- a/src/termchar.h +++ b/src/termchar.h @@ -30,9 +30,7 @@ struct tty_output /* There is nothing else here at the moment... */ }; -#ifndef TERMINFO enum { TERMCAP_BUFFER_SIZE = 4096 }; -#endif /* Parameters that are shared between frames on the same tty device. */ @@ -78,7 +76,6 @@ struct tty_display_info mouse-face. */ Mouse_HLInfo mouse_highlight; -#ifndef TERMINFO /* Buffer used internally by termcap (see tgetent in the Termcap manual). Only init_tty should use this. */ char termcap_term_buffer[TERMCAP_BUFFER_SIZE]; @@ -86,7 +83,6 @@ struct tty_display_info /* Buffer storing terminal description strings (see tgetstr in the Termcap manual). Only init_tty should use this. */ char termcap_strings_buffer[TERMCAP_BUFFER_SIZE]; -#endif /* Strings, numbers and flags taken from the termcap entry. */ |