diff options
| author | Xue Fuqiao | 2013-09-04 08:39:34 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-09-04 08:39:34 +0800 |
| commit | adf2fc4a01efe77d73cd52bc9173914ed56ff531 (patch) | |
| tree | a5a280a5554a7bffeaf94fccae29fa3ac1a5d066 /src/termcap.c | |
| parent | 63191d9f2043d2e67657e85a7b3842805dd1dad6 (diff) | |
| parent | 38726039b77db432989fed106c88e9f1aa463281 (diff) | |
| download | emacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.tar.gz emacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.zip | |
Merge from mainline.
Diffstat (limited to 'src/termcap.c')
| -rw-r--r-- | src/termcap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/termcap.c b/src/termcap.c index be05828eea6..aa225d9b3b1 100644 --- a/src/termcap.c +++ b/src/termcap.c | |||
| @@ -406,7 +406,7 @@ tgetent (char *bp, const char *name) | |||
| 406 | 406 | ||
| 407 | if (termcap_name && !filep && !strcmp (name, getenv ("TERM"))) | 407 | if (termcap_name && !filep && !strcmp (name, getenv ("TERM"))) |
| 408 | { | 408 | { |
| 409 | indirect = tgetst1 (find_capability (termcap_name, "tc"), (char **) 0); | 409 | indirect = tgetst1 (find_capability (termcap_name, "tc"), 0); |
| 410 | if (!indirect) | 410 | if (!indirect) |
| 411 | { | 411 | { |
| 412 | if (!bp) | 412 | if (!bp) |
| @@ -490,7 +490,7 @@ tgetent (char *bp, const char *name) | |||
| 490 | /* Does this entry refer to another terminal type's entry? | 490 | /* Does this entry refer to another terminal type's entry? |
| 491 | If something is found, copy it into heap and null-terminate it. */ | 491 | If something is found, copy it into heap and null-terminate it. */ |
| 492 | tc_search_point = find_capability (tc_search_point, "tc"); | 492 | tc_search_point = find_capability (tc_search_point, "tc"); |
| 493 | term = tgetst1 (tc_search_point, (char **) 0); | 493 | term = tgetst1 (tc_search_point, 0); |
| 494 | } | 494 | } |
| 495 | 495 | ||
| 496 | emacs_close (fd); | 496 | emacs_close (fd); |