diff options
| author | Eli Zaretskii | 2014-07-17 18:37:48 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-07-17 18:37:48 +0300 |
| commit | e8bd4b948b82fd47359e0cf9a0a9ebb802c01e78 (patch) | |
| tree | 571d63ba5abed216e94f068f768579cff7eb0669 /src/w32select.c | |
| parent | 9180cde1125adced11ca5125ebed4e988d776539 (diff) | |
| download | emacs-e8bd4b948b82fd47359e0cf9a0a9ebb802c01e78.tar.gz 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/w32select.c')
| -rw-r--r-- | src/w32select.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w32select.c b/src/w32select.c index 2ae25858bd2..7c21dde01a5 100644 --- a/src/w32select.c +++ b/src/w32select.c | |||
| @@ -670,7 +670,7 @@ setup_windows_coding_system (Lisp_Object coding_system, | |||
| 670 | which both apply to ISO6429 only. We don't know if these really | 670 | which both apply to ISO6429 only. We don't know if these really |
| 671 | need to be unset on Windows, but it probably doesn't hurt | 671 | need to be unset on Windows, but it probably doesn't hurt |
| 672 | either. */ | 672 | either. */ |
| 673 | coding->mode &= ~CODING_ANNOTATION_MASK; | 673 | coding->common_flags &= ~CODING_ANNOTATION_MASK; |
| 674 | coding->mode |= CODING_MODE_LAST_BLOCK | CODING_MODE_SAFE_ENCODING; | 674 | coding->mode |= CODING_MODE_LAST_BLOCK | CODING_MODE_SAFE_ENCODING; |
| 675 | } | 675 | } |
| 676 | 676 | ||