aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Third2019-10-28 11:21:29 +0000
committerAlan Third2019-10-31 20:40:56 +0000
commitfd1b720028064c2566ff4dcc3ad898346a0f6b77 (patch)
tree3ddc2c3264e33d3b22eb0707f49ef2b8e4f2c3cb
parentd75794fd5c168fb76406b88e231d8749160f934a (diff)
downloademacs-fd1b720028064c2566ff4dcc3ad898346a0f6b77.tar.gz
emacs-fd1b720028064c2566ff4dcc3ad898346a0f6b77.zip
Prevent text flicker with macOS input methods (bug#23412)
* src/nsterm.m ([EmacsView setMarkedText:selectedRange:]): Don't always delete the working text as ns-put-working-text does that.
-rw-r--r--src/nsterm.m8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nsterm.m b/src/nsterm.m
index 5583c6105cb..afe7069aaed 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6435,15 +6435,17 @@ not_in_argv (NSString *arg)
6435 (unsigned long)selRange.length, 6435 (unsigned long)selRange.length,
6436 (unsigned long)selRange.location); 6436 (unsigned long)selRange.location);
6437 6437
6438 if (workingText != nil)
6439 [self deleteWorkingText];
6440 if ([str length] == 0) 6438 if ([str length] == 0)
6441 return; 6439 {
6440 [self deleteWorkingText];
6441 return;
6442 }
6442 6443
6443 if (!emacs_event) 6444 if (!emacs_event)
6444 return; 6445 return;
6445 6446
6446 processingCompose = YES; 6447 processingCompose = YES;
6448 [workingText release];
6447 workingText = [str copy]; 6449 workingText = [str copy];
6448 ns_working_text = build_string ([workingText UTF8String]); 6450 ns_working_text = build_string ([workingText UTF8String]);
6449 6451