aboutsummaryrefslogtreecommitdiff
path: root/src/combinator.lisp
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-07-18 22:33:02 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-07-24 09:39:07 -0700
commit50915cdb6080aff3f0c29a369efd29aa5e47e5f2 (patch)
tree059f1a1542c3d0522c1579cf734b3ceda312f162 /src/combinator.lisp
parentf4e9170e73cb4bcfa7328422b4ff4f72d1339dd0 (diff)
downloadconsfigurator-50915cdb6080aff3f0c29a369efd29aa5e47e5f2.tar.gz
UNWIND-PROTECT-IN-PARENT -> UNWIND-PROTECT
No longer needed thanks to f4e9170e73cb4bcfa7328422b4ff4f72d1339dd0. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/combinator.lisp')
-rw-r--r--src/combinator.lisp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/combinator.lisp b/src/combinator.lisp
index a4274ee..cf73cce 100644
--- a/src/combinator.lisp
+++ b/src/combinator.lisp
@@ -173,11 +173,10 @@ apply the elements of REQUIREMENTS in reverse order."
;; the user or a combinator invokes a SKIP-PROPERTY restart
;; established further down the property call stack.
(result 'failed-change))
- (unwind-protect-in-parent
- (with-skip-property propapp
- (setq result (if announce
- (announce-propapp-apply propapp)
- (propapp-apply propapp))))
+ (unwind-protect (with-skip-property propapp
+ (setq result (if announce
+ (announce-propapp-apply propapp)
+ (propapp-apply propapp))))
(when (and (plusp (length buffer))
(or (> *consfigurator-debug-level* 1)
(not (eql result :no-change))))