Fix setting up coding-systems for clipboard access on MS-Windows and MS-DOS.

 src/w32select.c (setup_windows_coding_system): Apply
 CODING_ANNOTATION_MASK to the common_flags member of struct
 coding_system.  Reported by Martin Rudalics <rudalics@gmx.at>.
 src/w16select.c (Fw16_get_clipboard_data): Apply
 CODING_ANNOTATION_MASK to the common_flags member of struct
 coding_system.

diff --git a/src/ChangeLog b/src/ChangeLog
index 737a5078b244c2ec3e54658c2f03cf4aa40ba94b..d395e97246d8375693a81fca754c6fb690bbc61d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,14 @@
 2014-07-17  Eli Zaretskii  <eliz@gnu.org>
 
+       * w32select.c (setup_windows_coding_system): Apply
+       CODING_ANNOTATION_MASK to the common_flags member of struct
+       coding_system.  Reported by martin rudalics <rudalics@gmx.at>.
+
+       * w16select.c (Fw16_get_clipboard_data): Apply
+       CODING_ANNOTATION_MASK to the common_flags member of struct
+       coding_system.
+
+
        * xdisp.c (init_iterator): Initialize it->stop_charpos to the
        buffer position where we are to start the iteration.
        (handle_invisible_prop): Record in it->stop_charpos the position

diff --git a/src/w16select.c b/src/w16select.c
index 1e4d35b721b1abaa41bdd66d52629a80734bcb7e..4f88741f5c19a8da3fdd18f2d949069d45f7daf8 100644 (file)
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -600,7 +600,7 @@ DEFUN ("w16-get-clipboard-data", Fw16_get_clipboard_data, Sw16_get_clipboard_dat
       coding.mode |= CODING_MODE_LAST_BLOCK;
       /* We explicitly disable composition handling because selection
         data should not contain any composition sequence.  */
-      coding.mode &= CODING_ANNOTATION_MASK;
+      coding.common_flags &= CODING_ANNOTATION_MASK;
       decode_coding_object (&coding, Qnil, 0, 0, truelen, truelen, Qt);
       ret = coding.dst_object;
       Vlast_coding_system_used = CODING_ID_NAME (coding.id);

diff --git a/src/w32select.c b/src/w32select.c
index 2ae25858bd227776a2a495b6e028aa0596bce946..7c21dde01a581b10b165bb2ee2c05e8fc076e40b 100644 (file)
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -670,7 +670,7 @@ setup_windows_coding_system (Lisp_Object coding_system,
      which both apply to ISO6429 only.  We don't know if these really
      need to be unset on Windows, but it probably doesn't hurt
      either.  */
-  coding->mode &= ~CODING_ANNOTATION_MASK;
+  coding->common_flags &= ~CODING_ANNOTATION_MASK;
   coding->mode |= CODING_MODE_LAST_BLOCK | CODING_MODE_SAFE_ENCODING;
 }