>From f3e78727d77c50594fc9f4b03b8640825af49016 Mon Sep 17 00:00:00 2001
From: Alan Third <address@hidden>
Date: Sun, 24 Dec 2017 15:40:03 +0000
Subject: [PATCH] Handle NSAttributedString inputs (bug#29837)

; Do not merge to master.

* src/nsterm.m (EmacsView::insertText): Handle NSAttributedString.
---
 src/nsterm.m | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/nsterm.m b/src/nsterm.m
index d51782e538..c8b4a87990 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6317,11 +6317,18 @@ flag set (this is probably a bug in the OS).
          by doCommandBySelector: deleteBackward: */
 - (void)insertText: (id)aString
 {
-  NSString *s = aString;
-  NSUInteger len = [s length];
+  NSString *s;
+  NSUInteger len;
 
   NSTRACE ("[EmacsView insertText:]");
 
+  if ([aString isKindOfClass:[NSAttributedString class]])
+    s = [aString string];
+  else
+    s = aString;
+
+  len = [s length];
+
   if (NS_KEYLOG)
     NSLog (@"insertText '%@'\tlen = %lu", aString, (unsigned long) len);
   processingCompose = NO;
-- 
2.17.1