aboutsummaryrefslogtreecommitdiffstats
path: root/src/termchar.h
diff options
context:
space:
mode:
authorPaul Eggert2013-09-11 01:24:05 -0700
committerPaul Eggert2013-09-11 01:24:05 -0700
commit73f82c7e8eb6a009248f4ea6360b2182d06f55e2 (patch)
tree72a9eddac1e2c9c1db8a62b97031f72d53b66140 /src/termchar.h
parent53482f41157f37a7f6afb7f19be8fc63b015f6ed (diff)
downloademacs-73f82c7e8eb6a009248f4ea6360b2182d06f55e2.tar.gz
emacs-73f82c7e8eb6a009248f4ea6360b2182d06f55e2.zip
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.h4
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
30 /* There is nothing else here at the moment... */ 30 /* There is nothing else here at the moment... */
31}; 31};
32 32
33#ifndef TERMINFO
34enum { TERMCAP_BUFFER_SIZE = 4096 }; 33enum { TERMCAP_BUFFER_SIZE = 4096 };
35#endif
36 34
37/* Parameters that are shared between frames on the same tty device. */ 35/* Parameters that are shared between frames on the same tty device. */
38 36
@@ -78,7 +76,6 @@ struct tty_display_info
78 mouse-face. */ 76 mouse-face. */
79 Mouse_HLInfo mouse_highlight; 77 Mouse_HLInfo mouse_highlight;
80 78
81#ifndef TERMINFO
82 /* Buffer used internally by termcap (see tgetent in the Termcap 79 /* Buffer used internally by termcap (see tgetent in the Termcap
83 manual). Only init_tty should use this. */ 80 manual). Only init_tty should use this. */
84 char termcap_term_buffer[TERMCAP_BUFFER_SIZE]; 81 char termcap_term_buffer[TERMCAP_BUFFER_SIZE];
@@ -86,7 +83,6 @@ struct tty_display_info
86 /* Buffer storing terminal description strings (see tgetstr in the 83 /* Buffer storing terminal description strings (see tgetstr in the
87 Termcap manual). Only init_tty should use this. */ 84 Termcap manual). Only init_tty should use this. */
88 char termcap_strings_buffer[TERMCAP_BUFFER_SIZE]; 85 char termcap_strings_buffer[TERMCAP_BUFFER_SIZE];
89#endif
90 86
91 /* Strings, numbers and flags taken from the termcap entry. */ 87 /* Strings, numbers and flags taken from the termcap entry. */
92 88