procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stop term-erase-in-line disturbing markers

Browse source 
* lisp/term.el (term-erase-in-line): do nothing if there's nothing to
do; insert new newlines before deleting old ones.
This commit is contained in:
Daniel Colascione 2025-03-07 16:22:56 -08:00
parent a48659e57c
commit 062c6ab3dd
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lisp/term.el
View file

@ -4050,19 +4050,24 @@ all pending output has been dealt with."))
(wrapped (and (zerop (term-horizontal-column))
(not (zerop (term-current-column))))))
(term-vertical-motion 1)
(delete-region saved-point (point))
;; wrapped is true if we're at the beginning of screen line,
;; but not a buffer line. If we delete the current screen line
;; that will make the previous line no longer wrap, and (because
;; of the way Emacs display works) point will be at the end of
;; the previous screen line rather then the beginning of the
;; current one. To avoid that, we make sure that current line
;; contain a space, to force the previous line to continue to wrap.
;; We could do this always, but it seems preferable to not add the
;; extra space when wrapped is false.
(when wrapped
(insert ? ))
(insert ?\n)
;; Do nothing if we have nothing to delete
(unless (and (eq saved-point (1- (point)))
(eq (char-before) ?\n)
(not wrapped))
;; Insert before deletion to preserve markers.
;; wrapped is true if we're at the beginning of screen line,
;; but not a buffer line. If we delete the current screen line
;; that will make the previous line no longer wrap, and (because
;; of the way Emacs display works) point will be at the end of
;; the previous screen line rather then the beginning of the
;; current one. To avoid that, we make sure that current line
;; contain a space, to force the previous line to continue to wrap.
;; We could do this always, but it seems preferable to not add the
;; extra space when wrapped is false.
(when wrapped
(insert-before-markers ? ))
(insert-before-markers ?\n)
(delete-region saved-point (point)))
(put-text-property saved-point (point) 'font-lock-face 'default)
(goto-char saved-point))))