diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2024-10-18 17:56:15 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2024-10-18 17:56:15 +0200 |
| commit | cf01f8776a4488ac7e13d003502267b12f5a4de1 (patch) | |
| tree | 5e051d36b99c545db188251c0f8db669d1845f78 /lisp/emacs-lisp | |
| parent | 01eb03d8072c2481c10ded12e03a4347adbcd11f (diff) | |
| parent | 7dbbd58d6c9cafde2136b83ff149aa608203e207 (diff) | |
| download | emacs-cf01f8776a4488ac7e13d003502267b12f5a4de1.tar.gz emacs-cf01f8776a4488ac7e13d003502267b12f5a4de1.tar.bz2 emacs-cf01f8776a4488ac7e13d003502267b12f5a4de1.zip | |
Merge from origin/emacs-30
7dbbd58d6c9 Locate password icon in global-mode-string
19049efd30f ; Fix last documentation change
2c640e63a8a Explain tty-color-mode frame parameter more.
e5d600006e2 ; * src/doc.c (Ftext_quoting_style): Make doc string agre...
90c6880a922 (track-changes--after): Fix problem found in bug#73041
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/track-changes.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/emacs-lisp/track-changes.el b/lisp/emacs-lisp/track-changes.el index 7d1c928c92a..2d45f41ae94 100644 --- a/lisp/emacs-lisp/track-changes.el +++ b/lisp/emacs-lisp/track-changes.el @@ -591,16 +591,16 @@ Details logged to `track-changes--error-log'") (defun track-changes--after (beg end len) (track-changes--trace) (cl-assert track-changes--state) - (and (eq track-changes--before-clean 'unset) - (not track-changes--before-no) - ;; This can be a sign that a `before-change-functions' went missing, - ;; or that we called `track-changes--clean-state' between - ;; a `before-change-functions' and `after-change-functions'. - (track-changes--before beg end)) - (setq track-changes--before-clean nil) (let ((offset (- (- end beg) len))) - (cl-incf track-changes--before-end offset) (cl-incf track-changes--buffer-size offset) + (if (and (eq track-changes--before-clean 'unset) + (not track-changes--before-no)) + ;; This can be a sign that a `before-change-functions' went missing, + ;; or that we called `track-changes--clean-state' between + ;; a `before-change-functions' and `after-change-functions'. + (track-changes--before beg end) + (cl-incf track-changes--before-end offset)) + (setq track-changes--before-clean nil) (if (not (or track-changes--before-no (save-restriction (widen) |