[nongnu] elpa/dslide 93585c9173 158/230: slide composition order change (soon to refactor)

[ELPA Syncer]

branch: elpa/dslide
commit 93585c9173e03dc0aece9b472bed36eb2bf8aed0
Author: Psionik K <73710933+psionic-k@users.noreply.github.com>
Commit: Psionik K <73710933+psionic-k@users.noreply.github.com>

    slide composition order change (soon to refactor)
    
    There was a hack in place to allow the narrowing action to work.  This was
    revealed to be buggy by embedding some section actions in a child.
    
    Running the ordering in the originally intended way, with the slide always
    encompassing the section and child actions, fixed an issue where nested 
slides
    with items could behave bizarrely when going backward.
    
    Signed-off-by: Psionik K <73710933+psionic-k@users.noreply.github.com>
---
 dslide.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dslide.el b/dslide.el
index a1a6e9b685..f146c463da 100644
--- a/dslide.el
+++ b/dslide.el
@@ -946,12 +946,12 @@ order.")
         (child-action (oref obj child-action))
         (slide-action (oref obj slide-action))
         progress)
+    (unless (or progress (null slide-action))
+      (setq progress (dslide-forward slide-action)))
     (while (and (not progress) section-actions)
       (setq progress (dslide-forward (pop section-actions))))
     (unless (or progress (null child-action))
       (setq progress (dslide-forward child-action)))
-    (unless (or progress (null slide-action))
-      (setq progress (dslide-forward slide-action)))
     progress))
 
 (cl-defmethod dslide-backward ((obj dslide-slide))
@@ -961,10 +961,10 @@ order.")
         progress)
     (unless (null child-action)
       (setq progress (dslide-backward child-action)))
-    (while (and (not progress) section-actions)
-      (setq progress (dslide-backward (pop section-actions))))
     (unless (or progress (null slide-action))
       (setq progress (dslide-backward slide-action)))
+    (while (and (not progress) section-actions)
+      (setq progress (dslide-backward (pop section-actions))))
     progress))
 
 ;; `dslide--make-slide' is very critical to the user-facing configuration and