diff options
author | Eli Zaretskii <eliz@gnu.org> | 2014-07-17 18:37:48 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2014-07-17 18:37:48 +0300 |
commit | e8bd4b948b82fd47359e0cf9a0a9ebb802c01e78 (patch) | |
tree | 571d63ba5abed216e94f068f768579cff7eb0669 /src/w16select.c | |
parent | 9180cde1125adced11ca5125ebed4e988d776539 (diff) | |
download | emacs-e8bd4b948b82fd47359e0cf9a0a9ebb802c01e78.tar.gz emacs-e8bd4b948b82fd47359e0cf9a0a9ebb802c01e78.tar.bz2 emacs-e8bd4b948b82fd47359e0cf9a0a9ebb802c01e78.zip |
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.
Diffstat (limited to 'src/w16select.c')
-rw-r--r-- | src/w16select.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w16select.c b/src/w16select.c index 1e4d35b721b..4f88741f5c1 100644 --- 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); |