[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/undo-tree c39882f 177/195: Prevent misleading message a
From: |
Stefan Monnier |
Subject: |
[elpa] externals/undo-tree c39882f 177/195: Prevent misleading message about discarded undo history on first undo. |
Date: |
Sat, 28 Nov 2020 13:41:48 -0500 (EST) |
branch: externals/undo-tree
commit c39882f42986012b55b8dc765fb96c8cf9f091f9
Author: Toby S. Cubitt <toby-undo-tree@dr-qubit.org>
Commit: Toby S. Cubitt <toby-undo-tree@dr-qubit.org>
Prevent misleading message about discarded undo history on first undo.
---
undo-tree.el | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/undo-tree.el b/undo-tree.el
index 989b76a..81eb435 100644
--- a/undo-tree.el
+++ b/undo-tree.el
@@ -1783,9 +1783,9 @@ Comparison is done with `eq'."
undo-list (copy-tree buffer-undo-list)))
(setq buffer-undo-list '(nil undo-tree-canary))
+ ;; create new node from first changeset in `undo-list', save old
+ ;; `buffer-undo-tree' current node, and make new node the current node
(when (setq changeset (undo-list-pop-changeset undo-list))
- ;; create new node from first changeset in `undo-list', save old
- ;; `buffer-undo-tree' current node, and make new node the current node
(let* ((node (undo-tree-make-node nil changeset))
(splice (undo-tree-current buffer-undo-tree))
(size (undo-list-byte-size (undo-tree-node-undo node)))
@@ -1796,6 +1796,7 @@ Comparison is done with `eq'."
(setq node (undo-tree-grow-backwards node changeset))
(incf size (undo-list-byte-size (undo-tree-node-undo node)))
(incf count))
+
;; if no undo history has been discarded from `undo-list' since last
;; transfer, splice new tree fragment onto end of old
;; `buffer-undo-tree' current node
@@ -1806,14 +1807,17 @@ Comparison is done with `eq'."
(setf (undo-tree-node-branch splice) 0)
(incf (undo-tree-size buffer-undo-tree) size)
(incf (undo-tree-count buffer-undo-tree) count))
+
;; if undo history has been discarded, replace entire
;; `buffer-undo-tree' with new tree fragment
- (message "Undo history discarded by Emacs - rebuilding undo-tree")
+ (unless (= (undo-tree-size buffer-undo-tree) 0)
+ (message "Undo history discarded by Emacs - rebuilding undo-tree"))
(setq node (undo-tree-grow-backwards node nil))
(setf (undo-tree-root buffer-undo-tree) node)
(setf (undo-tree-size buffer-undo-tree) size)
(setf (undo-tree-count buffer-undo-tree) count)
(setq undo-list '(nil undo-tree-canary))))))
+
;; discard undo history if necessary
(undo-tree-discard-history))
- [elpa] externals/undo-tree 7d12602 150/195: Fix formatting bug in absolute timestamps., (continued)
- [elpa] externals/undo-tree 7d12602 150/195: Fix formatting bug in absolute timestamps., Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree 01b4a86 151/195: Update comment about Emacs version required for persistent history., Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree 8105f5f 143/195: Temporarily disable diff wto speed up undoing-to-x., Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree aabc832 147/195: Remove unused variable., Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree 4cba00b 163/195: Fix one of the diagrams in the Commentary., Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree 3a772b7 170/195: Bump copyright year and version number., Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree bf3a146 167/195: Disable undo-in-region by default., Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree eec9edd 168/195: Silence some unused variable compiler warnings., Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree 77c29a6 171/195: Factor out canary checking into undo-list-found-canary-p., Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree 4a72a1e 172/195: Change undo-list-pop-changeset to macro taking buffer-undo-list argument., Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree c39882f 177/195: Prevent misleading message about discarded undo history on first undo.,
Stefan Monnier <=
- [elpa] externals/undo-tree e6f31a0 179/195: Use custom undo-[strong-|outer]-limit values in undo-tree-mode., Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree 2ac4eac 181/195: Improve messages displayed to user when undo history is discarded., Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree 6a428ce 182/195: Bump copyright year in readiness for new release., Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree 7fb46cb 183/195: Fix copy-undo-tree by forcing vector rather than native defstruct., Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree 5011f91 186/195: Implement non-recursive undo-tree copier, to avoid hitting Elisp and c stack space limits., Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree 0161041 194/195: Fix argument order in gv setter definitions., Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree bf2e9ba 195/195: Print complete objects when saving undo-tree history, Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree 75b17c3 189/195: undo-outer-limit can also be null (no limit) in recent Emacsen., Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree 09641b2 188/195: Bump version number., Stefan Monnier, 2020/11/28
- [elpa] externals/undo-tree 1cc3a18 052/195: Minor documentation fix., Stefan Monnier, 2020/11/28