Release 5.18arelease_5.18a

4 files changed, 6 insertions, 4 deletions

diff --git a/org-install.el b/org-install.el
index c137453ae..f45acaea3 100644
--- a/org-install.el
+++ b/org-install.el
@@ -8,7 +8,7 @@
 ;;;;;;  org-remember-insinuate org-open-at-point-global org-insert-link-global
 ;;;;;;  org-store-link orgtbl-mode turn-on-orgtbl org-run-like-in-org-mode
 ;;;;;;  turn-on-orgstruct++ turn-on-orgstruct orgstruct-mode org-global-cycle
-;;;;;;  org-cycle org-mode) "org" "org.el" (18304 36012))
+;;;;;;  org-cycle org-mode) "org" "org.el" (18304 62409))
 ;;; Generated autoloads from org.el
 
 (autoload (quote org-mode) "org" "\
diff --git a/org.el b/org.el
index d4449a570..42cdda01f 100644
--- a/org.el
+++ b/org.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 5.18
+;; Version: 5.18a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -5750,7 +5750,8 @@ This function is the default value of the hook `org-cycle-hook'."
 	    (hide-subtree)
 	    (show-entry)
 	    (show-children)
-	    (org-cycle-show-empty-lines 'children))
+	    (org-cycle-show-empty-lines 'children)
+	    (org-cycle-hide-drawers 'children))
 	(org-overview)))))
 
 (defun org-cycle-show-empty-lines (state)
@@ -6377,7 +6378,8 @@ is signaled in this case."
     (org-compact-display-after-subtree-move)
     (unless folded
       (org-show-entry)
-      (show-children))))
+      (show-children)
+      (org-cycle-hide-drawers 'children))))
 
 (defvar org-subtree-clip ""
   "Clipboard for cut and paste of subtrees.
diff --git a/org.pdf b/org.pdf
index cb8e710c7..68f013121 100644
--- a/org.pdf
+++ b/org.pdf
diff --git a/orgcard.pdf b/orgcard.pdf
index 73721b4f9..855631728 100644
--- a/orgcard.pdf
+++ b/orgcard.pdf