Commit 89d0c445 authored by Alan Third's avatar Alan Third

Revert "Fix display of working text on NS (Bug#23412, Bug#1453)"

This reverts commit ba042176.

Do not merge to master (bug#38851)
parent ad5e350a
Pipeline #4776 passed with stage
in 56 minutes and 31 seconds
......@@ -314,9 +314,10 @@ The overlay is assigned the face `ns-working-text-face'."
(interactive)
(ns-delete-working-text)
(let ((start (point)))
(overlay-put (setq ns-working-overlay (make-overlay start (point)))
'after-string
(propertize ns-working-text 'face 'ns-working-text-face))))
(insert ns-working-text)
(overlay-put (setq ns-working-overlay (make-overlay start (point)
(current-buffer) nil t))
'face 'ns-working-text-face)))
(defun ns-echo-working-text ()
"Echo contents of `ns-working-text' in message display area.
......@@ -339,7 +340,8 @@ See `ns-insert-working-text'."
;; Still alive?
(overlay-buffer ns-working-overlay))
(with-current-buffer (overlay-buffer ns-working-overlay)
(overlay-put ns-working-overlay 'after-string nil)
(delete-region (overlay-start ns-working-overlay)
(overlay-end ns-working-overlay))
(delete-overlay ns-working-overlay)))
((integerp ns-working-overlay)
(let ((msg (current-message))
......
......@@ -6456,6 +6456,10 @@ - (void)insertText: (id)aString
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 @@ - (void)insertText: (id)aString
emacs_event->code = code;
EV_TRAILER ((id)nil);
}
/* Last, clear any working text. */
if (workingText != nil)
[self deleteWorkingText];
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment