[elpa] externals/undo-tree 75b17c3 189/195: undo-outer-limit can also be null (no limit) in recent Emacsen.

[Stefan Monnier]

branch: externals/undo-tree
commit 75b17c35ddbf7fb70a41a34ee07f9d7ed45f69a3
Author: Toby S. Cubitt <toby-undo-tree@dr-qubit.org>
Commit: Toby S. Cubitt <toby-undo-tree@dr-qubit.org>

    undo-outer-limit can also be null (no limit) in recent Emacsen.
---
 undo-tree.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/undo-tree.el b/undo-tree.el
index 229d9e9..03adb79 100644
--- a/undo-tree.el
+++ b/undo-tree.el
@@ -2096,7 +2096,8 @@ set by `undo-limit', `undo-strong-limit' and 
`undo-outer-limit'."
        (message "Undo history discarded by undo-tree (see `undo-tree-limit')"))
 
       ;; if we're still over the `undo-outer-limit', discard entire history
-      (when (> (undo-tree-size buffer-undo-tree) undo-outer-limit)
+      (when (and undo-outer-limit
+                (> (undo-tree-size buffer-undo-tree) undo-outer-limit))
         ;; query first if `undo-ask-before-discard' is set
         (if undo-ask-before-discard
             (when (yes-or-no-p
@@ -2801,10 +2802,9 @@ Within the undo-tree visualizer, the following keys are 
available:
         (if undo-tree-limit
             (max undo-strong-limit undo-tree-strong-limit)
           most-positive-fixnum))
-    (set (make-local-variable 'undo-outer-limit)
-        (if undo-tree-limit
-            (max undo-outer-limit undo-tree-outer-limit)
-          most-positive-fixnum))
+    (set (make-local-variable 'undo-outer-limit)  ; null `undo-outer-limit' 
means no limit
+        (when (and undo-tree-limit undo-outer-limit undo-outer-limit)
+          (max undo-outer-limit undo-tree-outer-limit)))
     (when (null undo-tree-limit)
       (setq undo-tree-timer
            (run-with-idle-timer 5 'repeat #'undo-list-transfer-to-tree)))