diff options
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/term.c b/src/term.c index 376d6e7831a..f5f4882161e 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -2933,7 +2933,7 @@ dissociate_if_controlling_tty (int fd) | |||
| 2933 | 2933 | ||
| 2934 | TERMINAL_TYPE is the termcap type of the device, e.g. "vt100". | 2934 | TERMINAL_TYPE is the termcap type of the device, e.g. "vt100". |
| 2935 | 2935 | ||
| 2936 | If MUST_SUCCEED is true, then all errors are fatal. */ | 2936 | If MUST_SUCCEED is true, then all errors are fatal. */ |
| 2937 | 2937 | ||
| 2938 | struct terminal * | 2938 | struct terminal * |
| 2939 | init_tty (const char *name, const char *terminal_type, bool must_succeed) | 2939 | init_tty (const char *name, const char *terminal_type, bool must_succeed) |
| @@ -2944,7 +2944,7 @@ init_tty (const char *name, const char *terminal_type, bool must_succeed) | |||
| 2944 | int status; | 2944 | int status; |
| 2945 | struct tty_display_info *tty = NULL; | 2945 | struct tty_display_info *tty = NULL; |
| 2946 | struct terminal *terminal = NULL; | 2946 | struct terminal *terminal = NULL; |
| 2947 | bool ctty = 0; /* True if asked to open controlling tty. */ | 2947 | bool ctty = false; /* True if asked to open controlling tty. */ |
| 2948 | 2948 | ||
| 2949 | if (!terminal_type) | 2949 | if (!terminal_type) |
| 2950 | maybe_fatal (must_succeed, 0, | 2950 | maybe_fatal (must_succeed, 0, |
| @@ -3031,7 +3031,7 @@ init_tty (const char *name, const char *terminal_type, bool must_succeed) | |||
| 3031 | tty->termcap_term_buffer = xmalloc (buffer_size); | 3031 | tty->termcap_term_buffer = xmalloc (buffer_size); |
| 3032 | 3032 | ||
| 3033 | /* On some systems, tgetent tries to access the controlling | 3033 | /* On some systems, tgetent tries to access the controlling |
| 3034 | terminal. */ | 3034 | terminal. */ |
| 3035 | block_tty_out_signal (); | 3035 | block_tty_out_signal (); |
| 3036 | status = tgetent (tty->termcap_term_buffer, terminal_type); | 3036 | status = tgetent (tty->termcap_term_buffer, terminal_type); |
| 3037 | unblock_tty_out_signal (); | 3037 | unblock_tty_out_signal (); |
| @@ -3101,13 +3101,13 @@ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ | |||
| 3101 | Right (tty) = tgetstr ("nd", address); | 3101 | Right (tty) = tgetstr ("nd", address); |
| 3102 | Down (tty) = tgetstr ("do", address); | 3102 | Down (tty) = tgetstr ("do", address); |
| 3103 | if (!Down (tty)) | 3103 | if (!Down (tty)) |
| 3104 | Down (tty) = tgetstr ("nl", address); /* Obsolete name for "do" */ | 3104 | Down (tty) = tgetstr ("nl", address); /* Obsolete name for "do". */ |
| 3105 | if (tgetflag ("bs")) | 3105 | if (tgetflag ("bs")) |
| 3106 | Left (tty) = "\b"; /* can't possibly be longer! */ | 3106 | Left (tty) = "\b"; /* Can't possibly be longer! */ |
| 3107 | else /* (Actually, "bs" is obsolete...) */ | 3107 | else /* (Actually, "bs" is obsolete...) */ |
| 3108 | Left (tty) = tgetstr ("le", address); | 3108 | Left (tty) = tgetstr ("le", address); |
| 3109 | if (!Left (tty)) | 3109 | if (!Left (tty)) |
| 3110 | Left (tty) = tgetstr ("bc", address); /* Obsolete name for "le" */ | 3110 | Left (tty) = tgetstr ("bc", address); /* Obsolete name for "le". */ |
| 3111 | tty->TS_pad_char = tgetstr ("pc", address); | 3111 | tty->TS_pad_char = tgetstr ("pc", address); |
| 3112 | tty->TS_repeat = tgetstr ("rp", address); | 3112 | tty->TS_repeat = tgetstr ("rp", address); |
| 3113 | tty->TS_end_standout_mode = tgetstr ("se", address); | 3113 | tty->TS_end_standout_mode = tgetstr ("se", address); |
| @@ -3229,7 +3229,7 @@ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ | |||
| 3229 | don't think we're losing anything by turning it off. */ | 3229 | don't think we're losing anything by turning it off. */ |
| 3230 | terminal->line_ins_del_ok = 0; | 3230 | terminal->line_ins_del_ok = 0; |
| 3231 | 3231 | ||
| 3232 | tty->TN_max_colors = 16; /* Required to be non-zero for tty-display-color-p */ | 3232 | tty->TN_max_colors = 16; /* Must be non-zero for tty-display-color-p. */ |
| 3233 | #endif /* DOS_NT */ | 3233 | #endif /* DOS_NT */ |
| 3234 | 3234 | ||
| 3235 | #ifdef HAVE_GPM | 3235 | #ifdef HAVE_GPM |
| @@ -3325,16 +3325,16 @@ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ | |||
| 3325 | tty->Wcm->cm_tab = 0; | 3325 | tty->Wcm->cm_tab = 0; |
| 3326 | /* We can't support standout mode, because it uses magic cookies. */ | 3326 | /* We can't support standout mode, because it uses magic cookies. */ |
| 3327 | tty->TS_standout_mode = 0; | 3327 | tty->TS_standout_mode = 0; |
| 3328 | /* But that means we cannot rely on ^M to go to column zero! */ | 3328 | /* But that means we cannot rely on ^M to go to column zero! */ |
| 3329 | CR (tty) = 0; | 3329 | CR (tty) = 0; |
| 3330 | /* LF can't be trusted either -- can alter hpos */ | 3330 | /* LF can't be trusted either -- can alter hpos. */ |
| 3331 | /* if move at column 0 thru a line with TS_standout_mode */ | 3331 | /* If move at column 0 thru a line with TS_standout_mode. */ |
| 3332 | Down (tty) = 0; | 3332 | Down (tty) = 0; |
| 3333 | } | 3333 | } |
| 3334 | 3334 | ||
| 3335 | tty->specified_window = FrameRows (tty); | 3335 | tty->specified_window = FrameRows (tty); |
| 3336 | 3336 | ||
| 3337 | if (Wcm_init (tty) == -1) /* can't do cursor motion */ | 3337 | if (Wcm_init (tty) == -1) /* Can't do cursor motion. */ |
| 3338 | { | 3338 | { |
| 3339 | maybe_fatal (must_succeed, terminal, | 3339 | maybe_fatal (must_succeed, terminal, |
| 3340 | "Terminal type \"%s\" is not powerful enough to run Emacs", | 3340 | "Terminal type \"%s\" is not powerful enough to run Emacs", |