[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100510: Fix bug #8122 with decoding keyboard input.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100510
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Sat 2011-02-26 23:30:16 +0200
message:
  Fix bug #8122 with decoding keyboard input.
  
   lisp/international/mule-cmds.el (set-default-coding-systems): Use
   the -unix variant of encoding in default-keyboard-coding-system.
modified:
  lisp/ChangeLog
  lisp/international/mule-cmds.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-26 00:18:16 +0000
+++ b/lisp/ChangeLog    2011-02-26 21:30:16 +0000
@@ -1,3 +1,9 @@
+2011-02-26  Eli Zaretskii  <address@hidden>
+
+       * international/mule-cmds.el (set-default-coding-systems): Use the
+       -unix variant of encoding in default-keyboard-coding-system.
+       (Bug#8122)
+
 2011-02-23  Kenichi Handa  <address@hidden>
 
        * mail/rmailmm.el (rmail-mime-process-multipart): Do not signal an

=== modified file 'lisp/international/mule-cmds.el'
--- a/lisp/international/mule-cmds.el   2011-02-18 15:43:22 +0000
+++ b/lisp/international/mule-cmds.el   2011-02-26 21:30:16 +0000
@@ -368,7 +368,9 @@
                 (coding-system-get coding-system 'ascii-compatible-p)))
        (setq default-file-name-coding-system coding-system)))
   (setq default-terminal-coding-system coding-system)
-  (setq default-keyboard-coding-system coding-system)
+  ;; Prevent default-terminal-coding-system from converting ^M to ^J.
+  (setq default-keyboard-coding-system
+       (coding-system-change-eol-conversion coding-system 'unix))
   ;; Preserve eol-type from existing default-process-coding-systems.
   ;; On non-unix-like systems in particular, these may have been set
   ;; carefully by the user, or by the startup code, to deal with the