branch: elpa/undo-fu
commit a2241d3b52c64ed298de3603041c58ac46fb9716
Author: Campbell Barton <[email protected]>
Commit: Campbell Barton <[email protected]>
Cleanup: simplify unconstrained undo checks
---
undo-fu.el | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/undo-fu.el b/undo-fu.el
index 0da8f30e66..c97f357a05 100644
--- a/undo-fu.el
+++ b/undo-fu.el
@@ -281,14 +281,13 @@ Optional argument ARG The number of steps to redo."
(success
(condition-case err
(progn
- (undo-fu--with-message-suffix
- (if undo-fu--respect
- ""
- " (unconstrained)")
- (if undo-fu--respect
- (undo-fu--backport-undo-redo steps)
- (let ((undo-no-redo nil))
- (undo steps))))
+ (cond
+ (undo-fu--respect
+ (undo-fu--backport-undo-redo steps))
+ (t
+ (undo-fu--with-message-suffix " (unconstrained)"
+ (let ((undo-no-redo nil))
+ (undo steps)))))
t)
(error
(progn
@@ -372,14 +371,13 @@ Optional argument ARG the number of steps to undo."
(success
(condition-case err
(progn
- (undo-fu--with-message-suffix
- (if undo-fu--respect
- ""
- " (unconstrained)")
- (if (or (not undo-fu--respect) undo-fu--in-region)
- (let ((undo-no-redo nil))
- (undo steps))
- (undo-only steps)))
+ (cond
+ ((and undo-fu--respect (not undo-fu--in-region))
+ (undo-only steps))
+ (t
+ (undo-fu--with-message-suffix " (unconstrained)"
+ (let ((undo-no-redo nil))
+ (undo steps)))))
t)
(error
(progn
