[elpa] externals/org 90db6d5b9c 1/4: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit 90db6d5b9c462909e6044a7bec2009a4ad5c3f26
Merge: ca5f852750 aba51fb584
Author: Ihor Radchenko <yantar92@posteo.net>
Commit: Ihor Radchenko <yantar92@posteo.net>

    Merge branch 'bugfix'
---
 lisp/org-fold-core.el    |  2 +-
 testing/lisp/test-org.el | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/lisp/org-fold-core.el b/lisp/org-fold-core.el
index 8a451a82b2..ffa689d4fa 100644
--- a/lisp/org-fold-core.el
+++ b/lisp/org-fold-core.el
@@ -1063,7 +1063,7 @@ means that the buffer should stay alive during the 
operation,
 because otherwise all these markers will point to nowhere."
   (declare (debug (form body)) (indent 1))
   (org-with-gensyms (regions)
-    `(let* ((,regions ,(org-fold-core-get-regions :with-markers use-markers)))
+    `(let* ((,regions (org-fold-core-get-regions :with-markers ,use-markers)))
        (unwind-protect (progn ,@body)
          (org-fold-core-regions ,regions :override t :clean-markers t)))))
 
diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el
index a2ceb3916b..0eed372d4f 100644
--- a/testing/lisp/test-org.el
+++ b/testing/lisp/test-org.el
@@ -3581,6 +3581,21 @@ SCHEDULED: <2017-05-06 Sat>
        (kill-buffer buffer))
      t)))
 
+(ert-deftest test-org/org-ctrl-c-ctrl-c ()
+  "Test `org-ctrl-c-ctrl-c' specifications."
+  ;; FIXME: Improve coverage.
+  ;; Preserve visibility after refreshing Org setup.
+  (org-test-with-temp-text
+      "#+TITLE: Test
+* Heading<point>
+text"
+    (org-overview)
+    (should (org-fold-folded-p (point) 'outline))
+    (save-excursion
+      (goto-char (point-min))
+      (org-ctrl-c-ctrl-c))
+    (should (org-fold-folded-p (point) 'outline))))
+
 
 ;;; Navigation