aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlan Third2017-12-24 15:40:03 +0000
committerAlan Third2018-06-17 11:50:58 +0100
commit48829cba2168bcf8bfe2301ebe694b37152a7959 (patch)
treefe2100acc164d965f6abfa84c3faaa119638064b /src
parent0deab3fbd8a51fc83ab7c8031f4e296a4003b055 (diff)
downloademacs-48829cba2168bcf8bfe2301ebe694b37152a7959.tar.gz
emacs-48829cba2168bcf8bfe2301ebe694b37152a7959.zip
Handle NSAttributedString inputs (bug#29837)
; Do not merge to master. * src/nsterm.m (EmacsView::insertText): Handle NSAttributedString.
Diffstat (limited to 'src')
-rw-r--r--src/nsterm.m11
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)
6317 by doCommandBySelector: deleteBackward: */ 6317 by doCommandBySelector: deleteBackward: */
6318- (void)insertText: (id)aString 6318- (void)insertText: (id)aString
6319{ 6319{
6320 NSString *s = aString; 6320 NSString *s;
6321 NSUInteger len = [s length]; 6321 NSUInteger len;
6322 6322
6323 NSTRACE ("[EmacsView insertText:]"); 6323 NSTRACE ("[EmacsView insertText:]");
6324 6324
6325 if ([aString isKindOfClass:[NSAttributedString class]])
6326 s = [aString string];
6327 else
6328 s = aString;
6329
6330 len = [s length];
6331
6325 if (NS_KEYLOG) 6332 if (NS_KEYLOG)
6326 NSLog (@"insertText '%@'\tlen = %lu", aString, (unsigned long) len); 6333 NSLog (@"insertText '%@'\tlen = %lu", aString, (unsigned long) len);
6327 processingCompose = NO; 6334 processingCompose = NO;