diff options
author | Alan Third <alan@idiocy.org> | 2017-12-24 15:40:03 +0000 |
---|---|---|
committer | Alan Third <alan@idiocy.org> | 2018-06-17 11:50:58 +0100 |
commit | 48829cba2168bcf8bfe2301ebe694b37152a7959 (patch) | |
tree | fe2100acc164d965f6abfa84c3faaa119638064b /src/nsterm.m | |
parent | 0deab3fbd8a51fc83ab7c8031f4e296a4003b055 (diff) | |
download | emacs-48829cba2168bcf8bfe2301ebe694b37152a7959.tar.gz |
Handle NSAttributedString inputs (bug#29837)
; Do not merge to master.
* src/nsterm.m (EmacsView::insertText): Handle NSAttributedString.
Diffstat (limited to 'src/nsterm.m')
-rw-r--r-- | src/nsterm.m | 11 |
1 files changed, 9 insertions, 2 deletions
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; |