From cb342d444c6c13671a5c1832d1723c073eca0a37 Mon Sep 17 00:00:00 2001
From: 8day <unknown>
Date: Thu, 20 Mar 2025 13:39:16 +1100
Subject: Bug [#2465]. Signal autoCompleteSelection converts from local
 encoding when not in Unicode mode.

---
 doc/ScintillaHistory.html                  | 5 +++++
 qt/ScintillaEditBase/ScintillaEditBase.cpp | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 01429dc42..573242ef4 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -587,6 +587,7 @@
 	<td>Pawel Z Wronek</td>
 	<td>Joachim Mairboeck</td>
 	<td>Gianluca Vaccari</td>
+	<td>8day</td>
     </tr>
     </table>
     <h2 id="Releases">Releases</h2>
@@ -612,6 +613,10 @@
 	On Qt, avoid a dwell start when the mouse is moved outside the Scintilla widget.
 	<a href="https://sourceforge.net/p/scintilla/bugs/2466/">Bug #2466</a>.
 	</li>
+	<li>
+	On Qt, autoCompleteSelection converts from local encoding when not in Unicode mode.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2465/">Bug #2465</a>.
+	</li>
     </ul>
     <h3>
        <a href="https://www.scintilla.org/scintilla555.zip">Release 5.5.5</a>
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp
index c1733607b..ef686de20 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -816,7 +816,7 @@ void ScintillaEditBase::notifyParent(NotificationData scn)
 			break;
 
 		case Notification::AutoCSelection:
-			emit autoCompleteSelection(scn.lParam, QString::fromUtf8(scn.text));
+			emit autoCompleteSelection(scn.lParam, sqt->IsUnicodeMode() ? QString::fromUtf8(scn.text) : QString::fromLocal8Bit(scn.text));
 			break;
 
 		case Notification::AutoCCancelled:
-- 
cgit v1.2.3