Update to Org 9.6.15

(cherry picked from commit 7591acfe38e3f5f3fb9b89e2b1ed08723b0298e6)

diff --git a/doc/misc/org.org b/doc/misc/org.org
index 6ca14c851b0c0b181c01931b28703e328d55b3db..0310dd66016b36d48e9261be949be95362b153af 100644 (file)
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -4606,7 +4606,7 @@ checked.
 #+cindex: statistics, for checkboxes
 #+cindex: checkbox statistics
 #+cindex: @samp{COOKIE_DATA}, property
-#+vindex: org-hierarchical-checkbox-statistics
+#+vindex: org-checkbox-hierarchical-statistics
 The =[2/4]= and =[1/3]= in the first and second line are cookies
 indicating how many checkboxes present in this entry have been checked
 off, and the total number of checkboxes present.  This can give you an
@@ -4614,7 +4614,7 @@ idea on how many checkboxes remain, even without opening a folded
 entry.  The cookies can be placed into a headline or into (the first
 line of) a plain list item.  Each cookie covers checkboxes of direct
 children structurally below the headline/item on which the cookie
-appears[fn:: Set the variable ~org-hierarchical-checkbox-statistics~
+appears[fn:: Set the variable ~org-checkbox-hierarchical-statistics~
 if you want such cookies to count all checkboxes below the cookie, not
 just those belonging to direct children.].  You have to insert the
 cookie yourself by typing either =[/]= or =[%]=.  With =[/]= you get

diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 11e046fc0dd51f16a0889c189701f518e5a9832e..c757d343bc8500146653f5b1e27b6d777d04e5ba 100644 (file)
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{9.6.13}
+\def\orgversionnumber{9.6.15}
 \def\versionyear{2023}          % latest update
 \input emacsver.tex
 

diff --git a/lisp/org/org-entities.el b/lisp/org/org-entities.el
index a84142f5d40b2be55db9566e54576d5073f81dd8..e6ed0e97c53c0fd3366b1b2add4d7cd28dd3c4de 100644 (file)
--- a/lisp/org/org-entities.el
+++ b/lisp/org/org-entities.el
@@ -41,14 +41,19 @@
 
 (defun org-entities--user-safe-p (v)
   "Non-nil if V is a safe value for `org-entities-user'."
-  (pcase v
-    (`nil t)
-    (`(,(and (pred stringp)
-            (pred (string-match-p "\\`[a-zA-Z][a-zA-Z0-9]*\\'")))
-       ,(pred stringp) ,(pred booleanp) ,(pred stringp)
-       ,(pred stringp) ,(pred stringp) ,(pred stringp))
-     t)
-    (_ nil)))
+  (cond
+   ((not v) t)
+   ((listp v)
+    (seq-every-p
+     (lambda (e)
+       (pcase e
+         (`(,(and (pred stringp)
+                     (pred (string-match-p "\\`[a-zA-Z][a-zA-Z0-9]*\\'")))
+            ,(pred stringp) ,(pred booleanp) ,(pred stringp)
+            ,(pred stringp) ,(pred stringp) ,(pred stringp))
+          t)
+         (_ nil)))
+     v))))
 
 (defcustom org-entities-user nil
   "User-defined entities used in Org to produce special characters.

diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index 39d40efcac6a641fba56d62a25c32b96ec156248..ce9bf7431ac4660e740c76ceb8c4b62eabbced98 100644 (file)
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -56,8 +56,8 @@ by `package-activate-all').")
   ;; `org-assert-version' calls would fail using strict
   ;; `org-git-version' check because the generated Org version strings
   ;; will not match.
-  `(unless (or org--inhibit-version-check (equal (org-release) ,(org-release)))
-     (warn "Org version mismatch.  Org loading aborted.
+  `(unless (or ,org--inhibit-version-check (equal (org-release) ,(org-release)))
+     (warn "Org version mismatch.
 This warning usually appears when a built-in Org version is loaded
 prior to the more recent Org version.
 
@@ -91,10 +91,15 @@ Version mismatch is commonly encountered in the following situations:
    early in the config.  Ideally, right after the straight.el
    bootstrap.  Moving `use-package' :straight declaration may not be
    sufficient if the corresponding `use-package' statement is
-   deferring the loading."
+   deferring the loading.
+
+4. A new Org version is synchronized with Emacs git repository and
+   stale .elc files are still left from the previous build.
+
+   It is recommended to remove .elc files from lisp/org directory and
+   re-compile."
            ;; Avoid `warn' replacing "'" with "’" (see `format-message').
-           "(straight-use-package 'org)")
-     (error "Org version mismatch.  Make sure that correct `load-path' is set early in init.el")))
+           "(straight-use-package 'org)")))
 
 ;; We rely on org-macs when generating Org version.  Checking Org
 ;; version here will interfere with Org build process.

diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 8eebdbe09b2f1e201dd334342246d05553950bfc..b41756ac53e7ff4b31cf1713bf6b34176e31dd91 100644 (file)
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -5,13 +5,13 @@
 (defun org-release ()
   "The release version of Org.
 Inserted by installing Org mode or when a release is made."
-   (let ((org-release "9.6.13"))
+   (let ((org-release "9.6.15"))
      org-release))
 ;;;###autoload
 (defun org-git-version ()
   "The Git version of Org mode.
 Inserted by installing Org or when a release is made."
-   (let ((org-git-version "release_9.6.13"))
+   (let ((org-git-version "release_9.6.15"))
      org-git-version))
 \f
 (provide 'org-version)

diff --git a/lisp/org/org.el b/lisp/org/org.el
index b63df8f59ea7118e50164658a1ee41f80c688fc4..63b3f86a44145e0918a2b63587edb8fe5f5f2041 100644 (file)
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -9,7 +9,7 @@
 ;; URL: https://orgmode.org
 ;; Package-Requires: ((emacs "26.1"))
 
-;; Version: 9.6.13
+;; Version: 9.6.15
 
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/ox-md.el b/lisp/org/ox-md.el
index d0ddaabbbe4c077e93eee573bbcfa019d5e6e3d7..e3e4d6d8ac39c566245285fa814b5f8ef2f50973 100644 (file)
--- a/lisp/org/ox-md.el
+++ b/lisp/org/ox-md.el
@@ -305,7 +305,7 @@ INFO is a plist used as a communication channel."
          (section-title (org-html--translate "Footnotes" info)))
     (when fn-alist
       (format (plist-get info :md-footnotes-section)
-              (org-md--headline-title headline-style 1 section-title)
+              (org-md--headline-title headline-style (plist-get info :md-toplevel-hlevel) section-title)
               (mapconcat (lambda (fn) (org-md--footnote-formatted fn info))
                          fn-alist
                          "\n")))))