From b9a036a96c5b3b8f8a2609e7390b7fc939252458 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 7 Mar 2019 23:13:18 -0500 Subject: [PATCH] editor/fold: check outline-mode folds before hs b/c hideshow fold checks produce more false positives. --- modules/editor/fold/autoload/evil.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/editor/fold/autoload/evil.el b/modules/editor/fold/autoload/evil.el index c6190807b..3a16c060e 100644 --- a/modules/editor/fold/autoload/evil.el +++ b/modules/editor/fold/autoload/evil.el @@ -45,11 +45,11 @@ Targets `vimmish-fold', `hideshow' and `outline' folds." (interactive) (save-excursion (cond ((+fold--vimish-fold-p) (vimish-fold-toggle)) - ((+fold--hideshow-fold-p) (+fold-from-eol (hs-toggle-hiding))) ((+fold--outline-fold-p) (cl-letf (((symbol-function #'outline-hide-subtree) (symbol-function #'outline-hide-entry))) - (outline-toggle-children)))))) + (outline-toggle-children))) + ((+fold--hideshow-fold-p) (+fold-from-eol (hs-toggle-hiding)))))) ;;;###autoload (defun +fold/open () @@ -59,10 +59,10 @@ Targets `vimmish-fold', `hideshow' and `outline' folds." (interactive) (save-excursion (cond ((+fold--vimish-fold-p) (vimish-fold-unfold)) - ((+fold--hideshow-fold-p) (+fold-from-eol (hs-show-block))) ((+fold--outline-fold-p) (outline-show-children) - (outline-show-entry))))) + (outline-show-entry)) + ((+fold--hideshow-fold-p) (+fold-from-eol (hs-show-block)))))) ;;;###autoload (defun +fold/close ()