Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
84164a0d
Commit
84164a0d
authored
Apr 12, 2010
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(init_tty): Move common text outside of #ifdef TERMINFO.
parent
2b0a91e7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
21 deletions
+11
-21
src/ChangeLog
src/ChangeLog
+2
-0
src/term.c
src/term.c
+9
-21
No files found.
src/ChangeLog
View file @
84164a0d
2010-04-13 Stefan Monnier <monnier@iro.umontreal.ca>
* term.c (init_tty): Move common text outside of #ifdef TERMINFO.
Try to solve the problem of spurious EOF chars in long lines of text
sent to interactive subprocesses.
* sysdep.c (child_setup_tty): Do not enable ICANON any more.
...
...
src/term.c
View file @
84164a0d
...
...
@@ -3593,25 +3593,18 @@ init_tty (char *name, char *terminal_type, int must_succeed)
}
if
(
status
==
0
)
{
#ifdef TERMINFO
maybe_fatal
(
must_succeed
,
terminal
,
"Terminal type %s is not defined"
,
"Terminal type %s is not defined.
\n
\
If that is not the actual type of terminal you have,
\n
\
use the Bourne shell command `TERM=... export TERM' (C-shell:
\n
\
`setenv TERM ...') to specify the correct type. It may be necessary
\n
\
to do `unset TERMINFO' (C-shell: `unsetenv TERMINFO') as well."
,
terminal_type
);
`setenv TERM ...') to specify the correct type. It may be necessary
\n
"
#ifdef TERMINFO
"to do `unset TERMINFO' (C-shell: `unsetenv TERMINFO') as well."
,
#else
maybe_fatal
(
must_succeed
,
terminal
,
"Terminal type %s is not defined"
,
"Terminal type %s is not defined.
\n
\
If that is not the actual type of terminal you have,
\n
\
use the Bourne shell command `TERM=... export TERM' (C-shell:
\n
\
`setenv TERM ...') to specify the correct type. It may be necessary
\n
\
to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well."
,
terminal_type
);
"to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well."
,
#endif
terminal_type
);
}
#ifndef TERMINFO
...
...
@@ -3878,20 +3871,15 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.",
{
maybe_fatal
(
must_succeed
,
terminal
,
"Terminal type
\"
%s
\"
is not powerful enough to run Emacs"
,
# ifdef TERMINFO
"Terminal type
\"
%s
\"
is not powerful enough to run Emacs.
\n
\
It lacks the ability to position the cursor.
\n
\
If that is not the actual type of terminal you have,
\n
\
use the Bourne shell command `TERM=... export TERM' (C-shell:
\n
\
`setenv TERM ...') to specify the correct type. It may be necessary
\n
\
to do `unset TERMINFO' (C-shell: `unsetenv TERMINFO') as well."
,
`setenv TERM ...') to specify the correct type. It may be necessary
\n
"
# ifdef TERMINFO
"to do `unset TERMINFO' (C-shell: `unsetenv TERMINFO') as well."
,
# else
/* TERMCAP */
"Terminal type
\"
%s
\"
is not powerful enough to run Emacs.
\n
\
It lacks the ability to position the cursor.
\n
\
If that is not the actual type of terminal you have,
\n
\
use the Bourne shell command `TERM=... export TERM' (C-shell:
\n
\
`setenv TERM ...') to specify the correct type. It may be necessary
\n
\
to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well."
,
"to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well."
,
# endif
/* TERMINFO */
terminal_type
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment