diff options
| author | Alan Third <alan@idiocy.org> | 2020-02-11 17:27:11 +0000 |
|---|---|---|
| committer | Alan Third <alan@idiocy.org> | 2020-02-11 17:27:11 +0000 |
| commit | 89d0c4451f4807a5f0e1adf9a9df395f84407066 (patch) | |
| tree | 16d9c590693aa76bf8bf7ca1d9f8706f671d980c /src/nsterm.m | |
| parent | ad5e350ab764f3a420d29f24ab3222f671b2e8c0 (diff) | |
| download | emacs-89d0c4451f4807a5f0e1adf9a9df395f84407066.tar.gz | |
This reverts commit ba042176d8931cdf9441b3b4919ec74b75019494.
Do not merge to master (bug#38851)
Diffstat (limited to 'src/nsterm.m')
| -rw-r--r-- | src/nsterm.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index c1d1d411176..ed2d82ceaef 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -6456,6 +6456,10 @@ not_in_argv (NSString *arg) if (!emacs_event) return; + /* First, clear any working text. */ + if (workingText != nil) + [self deleteWorkingText]; + /* It might be preferable to use getCharacters:range: below, cf. https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/CocoaPerformance/Articles/StringDrawing.html#//apple_ref/doc/uid/TP40001445-112378. However, we probably can't use SAFE_NALLOCA here because it might @@ -6484,10 +6488,6 @@ not_in_argv (NSString *arg) emacs_event->code = code; EV_TRAILER ((id)nil); } - - /* Last, clear any working text. */ - if (workingText != nil) - [self deleteWorkingText]; } |