summaryrefslogtreecommitdiff
path: root/src/terminal.c
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-10-12 21:06:27 +0000
committerMiles Bader <miles@gnu.org>2007-10-12 21:06:27 +0000
commit985773c9038f9847f9e7362f3b5fb0c8acac13a2 (patch)
tree12d10cb76729ccbdc5ace4688d15f83894a70cc9 /src/terminal.c
parent47632e43ca42e26da139289f1e0f4f69e8c140fd (diff)
downloademacs-985773c9038f9847f9e7362f3b5fb0c8acac13a2.tar.gz
Fix up multi-tty merge
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-261 Creator: Stefan Monnier <monnier@iro.umontreal.ca>
Diffstat (limited to 'src/terminal.c')
-rw-r--r--src/terminal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/terminal.c b/src/terminal.c
index 46ffb3c2dc8..8b1836b3681 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -242,8 +242,8 @@ create_terminal (void)
terminal->terminal_coding =
(struct coding_system *) xmalloc (sizeof (struct coding_system));
- setup_coding_system (Qnil, terminal->keyboard_coding);
- setup_coding_system (Qnil, terminal->terminal_coding);
+ setup_coding_system (Qno_conversion, terminal->keyboard_coding);
+ setup_coding_system (Qundecided, terminal->terminal_coding);
terminal->param_alist = Qnil;
return terminal;