From: Alan Third <alan@idiocy.org>
Date: Sun, 24 Dec 2017 15:40:03 +0000 (+0000)
Subject: Handle NSAttributedString inputs (bug#29837)
X-Git-Tag: emacs-26.1.90~346
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=48829cba2168bcf8bfe2301ebe694b37152a7959;p=emacs.git

Handle NSAttributedString inputs (bug#29837)

; Do not merge to master.

* src/nsterm.m (EmacsView::insertText): Handle NSAttributedString.
---

diff --git a/src/nsterm.m b/src/nsterm.m
index 799bbd5bc06..5ed71c9f8f1 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6317,11 +6317,18 @@ not_in_argv (NSString *arg)
          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;