[Emacs-diffs] /srv/bzr/emacs/trunk r111956: Fix bug #13879 with raw-text encoding of msdos.c.

[Eli Zaretskii]

------------------------------------------------------------
revno: 111956
fixes bug: http://debbugs.gnu.org/13879
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2013-03-06 18:21:26 +0200
message:
  Fix bug #13879 with raw-text encoding of msdos.c.
  
   src/msdos.c: Change encoding to cp850.  (Bug#13879)
   (fr_keyboard, it_keyboard, dk_keyboard): Update keyboard layouts.
modified:
  src/ChangeLog
  src/msdos.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-03-06 11:26:30 +0000
+++ b/src/ChangeLog     2013-03-06 16:21:26 +0000
@@ -1,3 +1,8 @@
+2013-03-06  Eli Zaretskii  <address@hidden>
+
+       * msdos.c: Change encoding to cp850.  (Bug#13879)
+       (fr_keyboard, it_keyboard, dk_keyboard): Update keyboard layouts.
+
 2013-03-06  Dmitry Antipov  <address@hidden>
 
        Coding system support cleanup and minor refactoring.

=== modified file 'src/msdos.c'
--- a/src/msdos.c       2013-02-17 16:49:27 +0000
+++ b/src/msdos.c       2013-03-06 16:21:26 +0000
@@ -1,4 +1,4 @@
-/* MS-DOS specific C utilities.          -*- coding: raw-text -*-
+/* MS-DOS specific C utilities.          -*- coding: cp850 -*-
 
 Copyright (C) 1993-1997, 1999-2013 Free Software Foundation, Inc.
 
@@ -20,6 +20,13 @@
 /* Contributed by Morten Welinder */
 /* New display, keyboard, and mouse control by Kim F. Storm */
 
+/* Note: This file MUST use a unibyte encoding, to both display the
+   keys on the non-US keyboard layout as their respective labels, and
+   provide the correct byte values for the keyboard input to inject
+   into Emacs.  See 'struct dos_keyboard_map' below.  As long as there
+   are only European keyboard layouts here, we are OK with DOS
+   codepage 850 encoding.  */
+
 /* Note: some of the stuff here was taken from end of sysdep.c in demacs. */
 
 #include <config.h>
@@ -1965,10 +1972,10 @@
 
 static struct dos_keyboard_map us_keyboard = {
 /* 0         1         2         3         4         5      */
-/* 01234567890123456789012345678901234567890 12345678901234 */
-  "`1234567890-=  qwertyuiop[]   asdfghjkl;'\\   zxcvbnm,./  ",
+/* 01234567890123456789012345678901234567890 123 45678901234 */
+  "`1234567890-=  qwertyuiop[]   asdfghjkl;'\\  \\zxcvbnm,./  ",
 /* 0123456789012345678901234567890123456789 012345678901234 */
-  "address@hidden&*()_+  QWERTYUIOP{}   ASDFGHJKL:\"|   ZXCVBNM<>?  ",
+  "address@hidden&*()_+  QWERTYUIOP{}   ASDFGHJKL:\"|  |ZXCVBNM<>?  ",
   0,                           /* no Alt-Gr key */
   0                            /* no translate table */
 };
@@ -1976,9 +1983,9 @@
 static struct dos_keyboard_map fr_keyboard = {
 /* 0         1         2         3         4         5      */
 /* 012 3456789012345678901234567890123456789012345678901234 */
-  "?&?\",(-?_??)=  azertyuiop^$   qsdfghjklm?*   wxcvbnm;:!  ",
+  "?&?\"'(-?_??)=  azertyuiop^$   qsdfghjklm?*  <wxcvbn,;:!  ",
 /* 0123456789012345678901234567890123456789012345678901234 */
-  " 1234567890?+  AZERTYUIOP??   QSDFGHJKLM%?   WXCVBN?./?  ",
+  " 1234567890?+  AZERTYUIOP??   QSDFGHJKLM%?  >WXCVBN?./?  ",
 /* 01234567 89012345678901234567890123456789012345678901234 */
   "  ~#{[|address@hidden             ?                              ",
   0                            /* no translate table */
@@ -2000,9 +2007,9 @@
 static struct dos_keyboard_map it_keyboard = {
 /* 0          1         2         3         4         5     */
 /* 0 123456789012345678901234567890123456789012345678901234 */
-  "\\1234567890'?< qwertyuiop?+>  asdfghjkl???   zxcvbnm,.-  ",
+  "\\1234567890'?< qwertyuiop?+>  asdfghjkl???  <zxcvbnm,.-  ",
 /* 01 23456789012345678901234567890123456789012345678901234 */
-  "|!\"?$%&/()=?^> QWERTYUIOP?*   ASDFGHJKL???   ZXCVBNM;:_  ",
+  "|!\"?$%&/()=?^> QWERTYUIOP?*   ASDFGHJKL???  >ZXCVBNM;:_  ",
 /* 0123456789012345678901234567890123456789012345678901234 */
   "        {}~`             []             @#               ",
   it_kbd_translate_table
@@ -2011,9 +2018,9 @@
 static struct dos_keyboard_map dk_keyboard = {
 /* 0         1         2         3         4         5      */
 /* 0123456789012345678901234567890123456789012345678901234 */
-  "?1234567890+|  qwertyuiop?~   asdfghjkl??'   zxcvbnm,.-  ",
+  "?1234567890+|  qwertyuiop?~   asdfghjkl??'  <zxcvbnm,.-  ",
 /* 01 23456789012345678901234567890123456789012345678901234 */
-  "?!\"#$%&/()=?`  QWERTYUIOP?^   ASDFGHJKL??*   ZXCVBNM;:_  ",
+  "?!\"#$%&/()=?`  QWERTYUIOP?^   ASDFGHJKL??*  >ZXCVBNM;:_  ",
 /* 0123456789012345678901234567890123456789012345678901234 */
   "  @?$  {[]} |                                             ",
   0                            /* no translate table */