From 1dc1fd4fed4a067aaa3f45b7085c1ff52def436d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Thu, 15 Feb 2024 00:31:14 -0500
Subject: [PATCH] Fix pasting in X11 mode... pastebuf should be UTF-8, not
ISO-Latin1.
---
src/conio/x_events.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/conio/x_events.c b/src/conio/x_events.c
index a6ee174259..69e49a35c7 100644
--- a/src/conio/x_events.c
+++ b/src/conio/x_events.c
@@ -1734,9 +1734,9 @@ x11_event(XEvent *ev)
x11.XGetWindowProperty(dpy, win, ev->xselection.property, 0, 0, True, AnyPropertyType, &pastebuf_format, &format, &len, &bytes_left, (unsigned char **)(&pastebuf));
if(bytes_left > 0 && format==8) {
x11.XGetWindowProperty(dpy, win, ev->xselection.property, 0, bytes_left, True, AnyPropertyType, &pastebuf_format, &format, &len, &dummy, (unsigned char **)&pastebuf);
- if (A(UTF8_STRING) && pastebuf_format == A(UTF8_STRING)) {
+ if (!(A(UTF8_STRING) && pastebuf_format == A(UTF8_STRING))) {
char *opb = pastebuf;
- pastebuf = (char *)utf8_to_cp(CIOLIB_ISO_8859_1, (uint8_t *)pastebuf, '?', strlen(pastebuf), NULL);
+ pastebuf = (char *)cp_to_utf8(CIOLIB_ISO_8859_1, (uint8_t *)pastebuf, strlen(pastebuf), NULL);
if (pastebuf == NULL)
pastebuf = opb;
else
--
GitLab