From d1c5dc2e41814f571e851cf5363e5c75f4f316ef Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jan 2015 17:00:49 +0100
Subject: [PATCH] Fix `org-set-visibility-according-to-property'

* lisp/org.el (org-set-visibility-according-to-property): Ensure state
  is exctracted from a real node property.  Ignore narrowing.
---
 lisp/org.el | 55 ++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index df8db2506..1222a6979 100755
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6983,34 +6983,33 @@ With a numeric prefix, show all headlines up to that level."
 (defun org-set-visibility-according-to-property (&optional no-cleanup)
   "Switch subtree visibilities according to :VISIBILITY: property."
   (interactive)
-  (let (org-show-entry-below state)
-    (save-excursion
-      (goto-char (point-min))
-      (while (re-search-forward
-	      "^[ \t]*:VISIBILITY:[ \t]+\\([a-z]+\\)"
-	      nil t)
-	(setq state (match-string 1))
-	(save-excursion
-	  (org-back-to-heading t)
-	  (hide-subtree)
-	  (org-reveal)
-	  (cond
-	   ((equal state '("fold" "folded"))
-	    (hide-subtree))
-	   ((equal state "children")
-	    (org-show-hidden-entry)
-	    (show-children))
-	   ((equal state "content")
-	    (save-excursion
-	      (save-restriction
-		(org-narrow-to-subtree)
-		(org-content))))
-	   ((member state '("all" "showall"))
-	    (show-subtree)))))
-      (unless no-cleanup
-	(org-cycle-hide-archived-subtrees 'all)
-	(org-cycle-hide-drawers 'all)
-	(org-cycle-show-empty-lines 'all)))))
+  (let (org-show-entry-below)
+    (org-with-wide-buffer
+     (goto-char (point-min))
+     (while (re-search-forward "^[ \t]*:VISIBILITY:" nil t)
+       (if (not (org-at-property-p)) (outline-next-heading)
+	 (let ((state (match-string 3)))
+	   (save-excursion
+	     (org-back-to-heading t)
+	     (hide-subtree)
+	     (org-reveal)
+	     (cond
+	      ((equal state "folded")
+	       (hide-subtree))
+	      ((equal state "children")
+	       (org-show-hidden-entry)
+	       (show-children))
+	      ((equal state "content")
+	       (save-excursion
+		 (save-restriction
+		   (org-narrow-to-subtree)
+		   (org-content))))
+	      ((member state '("all" "showall"))
+	       (show-subtree)))))))
+     (unless no-cleanup
+       (org-cycle-hide-archived-subtrees 'all)
+       (org-cycle-hide-drawers 'all)
+       (org-cycle-show-empty-lines 'all)))))
 
 ;; This function uses outline-regexp instead of the more fundamental
 ;; org-outline-regexp so that org-cycle-global works outside of Org