[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100466: Fix bug #7840 with setting terminal/keyboard encoding of emacsclient frames.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100466
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Sat 2011-02-12 04:47:28 -0500
message:
  Fix bug #7840 with setting terminal/keyboard encoding of emacsclient frames.
  
   terminal.c (create_terminal): Use default-keyboard-coding-system
   and default-terminal-coding-system to initialize coding systems of
   the new terminal.
modified:
  src/ChangeLog
  src/terminal.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-12 03:17:00 +0000
+++ b/src/ChangeLog     2011-02-12 09:47:28 +0000
@@ -1,3 +1,9 @@
+2011-02-12  Eli Zaretskii  <address@hidden>
+
+       * terminal.c (create_terminal): Use default-keyboard-coding-system
+       and default-terminal-coding-system to initialize coding systems of
+       the new terminal.  (Bug#7840)
+
 2011-02-09  Martin Rudalics  <address@hidden>
 
        * window.c (select_window): Check inhibit_point_swap argument when

=== modified file 'src/terminal.c'
--- a/src/terminal.c    2011-01-02 23:50:46 +0000
+++ b/src/terminal.c    2011-02-12 09:47:28 +0000
@@ -226,6 +226,7 @@
 create_terminal (void)
 {
   struct terminal *terminal = allocate_terminal ();
+  Lisp_Object terminal_coding, keyboard_coding;
 
   terminal->name = NULL;
   terminal->next_terminal = terminal_list;
@@ -238,8 +239,22 @@
   terminal->terminal_coding =
     (struct coding_system *) xmalloc (sizeof (struct coding_system));
 
-  setup_coding_system (Qno_conversion, terminal->keyboard_coding);
-  setup_coding_system (Qundecided, terminal->terminal_coding);
+  /* If default coding systems for the terminal and the keyboard are
+     already defined, use them in preference to the defaults.  This is
+     needed when Emacs runs in daemon mode.  */
+  keyboard_coding = SYMBOL_VALUE (intern ("default-keyboard-coding-system"));
+  if (NILP (keyboard_coding)
+      || EQ (keyboard_coding, Qunbound)
+      || NILP (Fcoding_system_p (keyboard_coding)))
+    keyboard_coding = Qno_conversion;
+  terminal_coding = SYMBOL_VALUE (intern ("default-terminal-coding-system"));
+  if (NILP (terminal_coding)
+      || EQ (terminal_coding, Qunbound)
+      || NILP (Fcoding_system_p (terminal_coding)))
+    terminal_coding = Qundecided;
+
+  setup_coding_system (keyboard_coding, terminal->keyboard_coding);
+  setup_coding_system (terminal_coding, terminal->terminal_coding);
 
   terminal->param_alist = Qnil;
   return terminal;