Merge branch 'maint'

Conflicts:
	lisp/org.el

lisp/org-agenda.el

@@ -3754,7 +3754,7 @@ Also moves point to the end of the skipped region, so that search can
 continue from there."
   (let ((p (point-at-bol)) to)
     (when (or
-	   (eq (get-text-property p 'face) 'font-lock-comment-face)
+	   (save-excursion (goto-char p) (looking-at comment-start-skip))
 	   (and org-agenda-skip-archived-trees (not org-agenda-archives-mode)
 		(get-text-property p :org-archived)
 		(org-end-of-subtree t))

lisp/org.el

@@ -17065,6 +17065,20 @@ This requires Emacs >= 24.1, build with imagemagick support."
 	  (list :tag "Use #+ATTR* or a number of pixels" (integer))
 	  (const :tag "Use #+ATTR* or don't resize" nil)))
 
+(defcustom org-agenda-inhibit-startup-visibility-cycling t
+  "Turn off visibility cycling when preparing agenda buffers.
+
+When preparing agenda buffers, Org visits agenda files.  When
+this variable is `t' (the default), the visited buffers for
+agenda files will not honor `org-startup-folded' or any
+#+STARTUP: fold option.  Turning this option off may slow down
+the generation of agenda, both because folding takes time and
+because finding entries in folded buffers takes longer than
+finding entries in unfolded ones."
+  :type 'boolean
+  :version "24.3"
+  :group 'org-agenda)
+
 (defun org-duration-string-to-minutes (s &optional output-to-string)
   "Convert a duration string S to minutes.
 
@@ -17404,6 +17418,8 @@ When a buffer is unmodified, it is just killed.  When modified, it is saved
 	(pc '(:org-comment t))
 	(pall '(:org-archived t :org-comment t))
 	(inhibit-read-only t)
+	(org-inhibit-startup-visibility-stuff
+	 org-agenda-inhibit-startup-visibility-cycling)
 	(rea (concat ":" org-archive-tag ":"))
 	bmp file re)
     (save-excursion