diff options
| author | Lars Magne Ingebrigtsen | 2011-07-11 17:16:10 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-07-11 17:16:10 +0200 |
| commit | 22b9578d36d0dabde1c8ef745823135132988528 (patch) | |
| tree | ad6ee2efef7f4e6eca0498acffd9d10de25fa4a0 | |
| parent | be958f1d65a2d843b35824dfe30db24b616f6b21 (diff) | |
| download | emacs-22b9578d36d0dabde1c8ef745823135132988528.tar.gz emacs-22b9578d36d0dabde1c8ef745823135132988528.zip | |
Remove support for supdup, c10 and perq terminals, which are no longer supported.
Fixes: debbugs:1482
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/term.c | 49 |
2 files changed, 5 insertions, 49 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4aa8fa9c95c..f45920a2ce7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-07-11 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * term.c (init_tty): Remove support for supdup, c10 and perq | ||
| 4 | terminals, which are no longer supported (bug#1482). | ||
| 5 | |||
| 1 | 2011-07-10 Johan Bockgård <bojohan@gnu.org> | 6 | 2011-07-10 Johan Bockgård <bojohan@gnu.org> |
| 2 | 7 | ||
| 3 | * xdisp.c (Ftool_bar_lines_needed): Fix WINDOWP check. | 8 | * xdisp.c (Ftool_bar_lines_needed): Fix WINDOWP check. |
diff --git a/src/term.c b/src/term.c index be23e547514..b9f10b122a7 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -3505,55 +3505,6 @@ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ | |||
| 3505 | Down (tty) = 0; | 3505 | Down (tty) = 0; |
| 3506 | } | 3506 | } |
| 3507 | 3507 | ||
| 3508 | /* Special handling for certain terminal types known to need it */ | ||
| 3509 | |||
| 3510 | if (!strcmp (terminal_type, "supdup")) | ||
| 3511 | { | ||
| 3512 | terminal->memory_below_frame = 1; | ||
| 3513 | tty->Wcm->cm_losewrap = 1; | ||
| 3514 | } | ||
| 3515 | if (!strncmp (terminal_type, "c10", 3) | ||
| 3516 | || !strcmp (terminal_type, "perq")) | ||
| 3517 | { | ||
| 3518 | /* Supply a makeshift :wi string. | ||
| 3519 | This string is not valid in general since it works only | ||
| 3520 | for windows starting at the upper left corner; | ||
| 3521 | but that is all Emacs uses. | ||
| 3522 | |||
| 3523 | This string works only if the frame is using | ||
| 3524 | the top of the video memory, because addressing is memory-relative. | ||
| 3525 | So first check the :ti string to see if that is true. | ||
| 3526 | |||
| 3527 | It would be simpler if the :wi string could go in the termcap | ||
| 3528 | entry, but it can't because it is not fully valid. | ||
| 3529 | If it were in the termcap entry, it would confuse other programs. */ | ||
| 3530 | if (!tty->TS_set_window) | ||
| 3531 | { | ||
| 3532 | const char *m = tty->TS_termcap_modes; | ||
| 3533 | while (*m && strcmp (m, "\033v ")) | ||
| 3534 | m++; | ||
| 3535 | if (*m) | ||
| 3536 | tty->TS_set_window = "\033v%C %C %C %C "; | ||
| 3537 | } | ||
| 3538 | /* Termcap entry often fails to have :in: flag */ | ||
| 3539 | terminal->must_write_spaces = 1; | ||
| 3540 | /* :ti string typically fails to have \E^G! in it */ | ||
| 3541 | /* This limits scope of insert-char to one line. */ | ||
| 3542 | strcpy (area, tty->TS_termcap_modes); | ||
| 3543 | strcat (area, "\033\007!"); | ||
| 3544 | tty->TS_termcap_modes = area; | ||
| 3545 | area += strlen (area) + 1; | ||
| 3546 | p = AbsPosition (tty); | ||
| 3547 | /* Change all %+ parameters to %C, to handle | ||
| 3548 | values above 96 correctly for the C100. */ | ||
| 3549 | while (*p) | ||
| 3550 | { | ||
| 3551 | if (p[0] == '%' && p[1] == '+') | ||
| 3552 | p[1] = 'C'; | ||
| 3553 | p++; | ||
| 3554 | } | ||
| 3555 | } | ||
| 3556 | |||
| 3557 | tty->specified_window = FrameRows (tty); | 3508 | tty->specified_window = FrameRows (tty); |
| 3558 | 3509 | ||
| 3559 | if (Wcm_init (tty) == -1) /* can't do cursor motion */ | 3510 | if (Wcm_init (tty) == -1) /* can't do cursor motion */ |