[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117384: Fix setting up coding-systems for clipbo
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-24 r117384: Fix setting up coding-systems for clipboard access on MS-Windows and MS-DOS. |
Date: |
Thu, 17 Jul 2014 15:38:50 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117384
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-07-17 18:37:48 +0300
message:
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 <address@hidden>.
src/w16select.c (Fw16_get_clipboard_data): Apply
CODING_ANNOTATION_MASK to the common_flags member of struct
coding_system.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/w16select.c
w16select.c-20091113204419-o5vbwnq5f7feedwu-1103
src/w32select.c w32select.c-20091113204419-o5vbwnq5f7feedwu-949
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-07-17 15:25:21 +0000
+++ b/src/ChangeLog 2014-07-17 15:37:48 +0000
@@ -1,5 +1,14 @@
2014-07-17 Eli Zaretskii <address@hidden>
+ * w32select.c (setup_windows_coding_system): Apply
+ CODING_ANNOTATION_MASK to the common_flags member of struct
+ coding_system. Reported by martin rudalics <address@hidden>.
+
+ * 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
=== modified file 'src/w16select.c'
--- a/src/w16select.c 2014-01-01 07:43:34 +0000
+++ b/src/w16select.c 2014-07-17 15:37:48 +0000
@@ -600,7 +600,7 @@
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);
=== modified file 'src/w32select.c'
--- a/src/w32select.c 2014-01-01 07:43:34 +0000
+++ b/src/w32select.c 2014-07-17 15:37:48 +0000
@@ -670,7 +670,7 @@
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;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117384: Fix setting up coding-systems for clipboard access on MS-Windows and MS-DOS.,
Eli Zaretskii <=