diff options
| author | Alan Third | 2020-02-11 17:27:11 +0000 |
|---|---|---|
| committer | Alan Third | 2020-02-11 17:27:11 +0000 |
| commit | 89d0c4451f4807a5f0e1adf9a9df395f84407066 (patch) | |
| tree | 16d9c590693aa76bf8bf7ca1d9f8706f671d980c /src | |
| parent | ad5e350ab764f3a420d29f24ab3222f671b2e8c0 (diff) | |
| download | emacs-89d0c4451f4807a5f0e1adf9a9df395f84407066.tar.gz emacs-89d0c4451f4807a5f0e1adf9a9df395f84407066.zip | |
Revert "Fix display of working text on NS (Bug#23412, Bug#1453)"
This reverts commit ba042176d8931cdf9441b3b4919ec74b75019494.
Do not merge to master (bug#38851)
Diffstat (limited to 'src')
| -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) | |||
| 6456 | if (!emacs_event) | 6456 | if (!emacs_event) |
| 6457 | return; | 6457 | return; |
| 6458 | 6458 | ||
| 6459 | /* First, clear any working text. */ | ||
| 6460 | if (workingText != nil) | ||
| 6461 | [self deleteWorkingText]; | ||
| 6462 | |||
| 6459 | /* It might be preferable to use getCharacters:range: below, | 6463 | /* It might be preferable to use getCharacters:range: below, |
| 6460 | cf. https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/CocoaPerformance/Articles/StringDrawing.html#//apple_ref/doc/uid/TP40001445-112378. | 6464 | cf. https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/CocoaPerformance/Articles/StringDrawing.html#//apple_ref/doc/uid/TP40001445-112378. |
| 6461 | However, we probably can't use SAFE_NALLOCA here because it might | 6465 | However, we probably can't use SAFE_NALLOCA here because it might |
| @@ -6484,10 +6488,6 @@ not_in_argv (NSString *arg) | |||
| 6484 | emacs_event->code = code; | 6488 | emacs_event->code = code; |
| 6485 | EV_TRAILER ((id)nil); | 6489 | EV_TRAILER ((id)nil); |
| 6486 | } | 6490 | } |
| 6487 | |||
| 6488 | /* Last, clear any working text. */ | ||
| 6489 | if (workingText != nil) | ||
| 6490 | [self deleteWorkingText]; | ||
| 6491 | } | 6491 | } |
| 6492 | 6492 | ||
| 6493 | 6493 | ||