From 0e30a96404ab6e98f78c46e93e02b26a08be6856 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Tue, 14 Apr 2020 17:07:24 -0700
Subject: [PATCH] Use NSTextInputContext discardMarkedText when MacOS is Lion
 or later.

NSInput manager has been deprecated since 10.6
---
 modules/input/imquartz.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/input/imquartz.c b/modules/input/imquartz.c
index 7437ad1ceb..a6ac1a4708 100644
--- a/modules/input/imquartz.c
+++ b/modules/input/imquartz.c
@@ -270,9 +270,12 @@ discard_preedit (GtkIMContext *context)
 
   /* reset any partial input for this NSView */
   [(GdkQuartzView *)nsview unmarkText];
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
   NSInputManager *currentInputManager = [NSInputManager currentInputManager];
   [currentInputManager markedTextAbandoned:nsview];
-
+#else
+  [[NSTextInputContext currentInputContext] discardMarkedText];
+#endif
   if (qc->preedit_str && strlen (qc->preedit_str) > 0)
     {
       g_signal_emit_by_name (context, "commit", qc->preedit_str);