[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 48829cb 3/3: Handle NSAttributedString inputs (bu
From: |
Alan Third |
Subject: |
[Emacs-diffs] emacs-26 48829cb 3/3: Handle NSAttributedString inputs (bug#29837) |
Date: |
Sun, 17 Jun 2018 07:07:03 -0400 (EDT) |
branch: emacs-26
commit 48829cba2168bcf8bfe2301ebe694b37152a7959
Author: Alan Third <address@hidden>
Commit: Alan Third <address@hidden>
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 799bbd5..5ed71c9 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;