diff options
| author | Kenichi Handa | 2003-08-21 11:36:40 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2003-08-21 11:36:40 +0000 |
| commit | f730033e6c12eeb6d4d12778bb9ddc3d02e99653 (patch) | |
| tree | ed8bca427196a0321606e1d08d1188d794513c53 | |
| parent | 3dd3a50226507bd4a832c70c711df9f159c9ab10 (diff) | |
| download | emacs-f730033e6c12eeb6d4d12778bb9ddc3d02e99653.tar.gz emacs-f730033e6c12eeb6d4d12778bb9ddc3d02e99653.zip | |
(term_init): Fix previous change
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/term.c | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 07963de9e1b..fc8ce43d766 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2003-08-21 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * term.c (term_init): Fix previous change; don't rely on the | ||
| 4 | length of `buffer' if TERMINFO is defined. | ||
| 5 | |||
| 1 | 2003-08-20 Dave Love <fx@gnu.org> | 6 | 2003-08-20 Dave Love <fx@gnu.org> |
| 2 | 7 | ||
| 3 | * atimer.h: Include lisp.h. | 8 | * atimer.h: Include lisp.h. |
diff --git a/src/term.c b/src/term.c index 506fc16ffb3..bae059ea439 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -2229,14 +2229,12 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", | |||
| 2229 | #endif | 2229 | #endif |
| 2230 | } | 2230 | } |
| 2231 | 2231 | ||
| 2232 | #ifdef TERMINFO | 2232 | #ifndef TERMINFO |
| 2233 | area = (char *) xmalloc (buffer_size); | ||
| 2234 | #else | ||
| 2235 | if (strlen (buffer) >= buffer_size) | 2233 | if (strlen (buffer) >= buffer_size) |
| 2236 | abort (); | 2234 | abort (); |
| 2237 | 2235 | buffer_size = strlen (buffer); | |
| 2238 | area = (char *) xmalloc (strlen (buffer)); | ||
| 2239 | #endif | 2236 | #endif |
| 2237 | area = (char *) xmalloc (buffer_size); | ||
| 2240 | 2238 | ||
| 2241 | TS_ins_line = tgetstr ("al", address); | 2239 | TS_ins_line = tgetstr ("al", address); |
| 2242 | TS_ins_multi_lines = tgetstr ("AL", address); | 2240 | TS_ins_multi_lines = tgetstr ("AL", address); |