Merge branch 'bugfix'

doc/org-guide.org

@@ -167,7 +167,7 @@ visibility in the buffer.
   Show all, including drawers.
 
 When Emacs first visits an Org file, the global state is set to
-OVERVIEW, i.e., only the top level headlines are visible.  This can be
+~showeverything~, i.e., all file content is visible.  This can be
 configured through the variable ~org-startup-folded~, or on a per-file
 basis by adding a =STARTUP= keyword to =overview=, =content=,
 =showall=, =showeverything= or =show<n>levels= (n = 2..5) like this:

lisp/org-persist.el

@@ -448,6 +448,8 @@ FORMAT and ARGS are passed to `message'."
                  buffer-or-file (error-message-string err)))
          nil)))))
 
+;; FIXME: `pp' is very slow when writing even moderately large datasets
+;; We should probably drop it or find some fast formatter.
 (defun org-persist--write-elisp-file (file data &optional no-circular pp)
   "Write elisp DATA to FILE."
   ;; Fsync slightly reduces the chance of an incomplete filesystem
@@ -915,7 +917,7 @@ Otherwise, return t."
     (let ((index-file
            (org-file-name-concat org-persist-directory org-persist-index-file)))
       (org-persist--merge-index-with-disk)
-      (org-persist--write-elisp-file index-file org-persist--index t t)
+      (org-persist--write-elisp-file index-file org-persist--index t)
       (setq org-persist--index-age
             (file-attribute-modification-time (file-attributes index-file)))
       index-file)))

lisp/ox-html.el

@@ -2364,7 +2364,7 @@ is the language used for CODE, as a string, or nil."
      ((not (progn (require 'htmlize nil t)
 		(fboundp 'htmlize-region-for-paste)))
       ;; Emit a warning.
-      (warn "Cannot fontify source block (htmlize.el >= 1.34 required)")
+      (warn "Cannot fontify source block (htmlize.el >= 1.34 required).  Falling back to plain text.  (see `org-html-htmlize-output-type')")
       (org-html-encode-plain-text code))
      (t
       ;; Map language