Revert "Update to Org 9.6.19"

This reverts commit 07a392f445eb21c5e4681027eee9d981300a4309.
It was installed by mistake.

14 files changed, 49 insertions, 58 deletions

diff --git a/doc/misc/org.org b/doc/misc/org.org
index 441985c905f..9535eccc1e6 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -16712,7 +16712,6 @@ to HTML, the following links all point to a dedicated anchor in
 :END:
 #+cindex: sitemap, of published pages
 
-#+vindex: org-publish-project-alist
 The following properties may be used to control publishing of
 a map of files for a given project.
 
@@ -16730,12 +16729,6 @@ a map of files for a given project.
 
   Title of sitemap page.  Defaults to name of file.
 
-- ~:sitemap-style~ ::
-
-    Can be ~list~ (site-map is just an itemized list of the titles of
-    the files involved) or ~tree~ (the directory structure of the
-    source files is reflected in the site-map).  Defaults to ~tree~.
-
 - ~:sitemap-format-entry~ ::
 
   #+findex: org-publish-find-date
@@ -16781,6 +16774,21 @@ a map of files for a given project.
 
   Should sorting be case-sensitive?  Default ~nil~.
 
+- ~:sitemap-file-entry-format~ ::
+
+  With this option one can tell how a sitemap's entry is formatted in
+  the sitemap.  This is a format string with some escape sequences:
+  ~%t~ stands for the title of the file, ~%a~ stands for the author of
+  the file and ~%d~ stands for the date of the file.  The date is
+  retrieved with the ~org-publish-find-date~ function and formatted
+  with ~org-publish-sitemap-date-format~.  Default ~%t~.
+
+- ~:sitemap-date-format~ ::
+
+  Format string for the ~format-time-string~ function that tells how
+  a sitemap entry's date is to be formatted.  This property bypasses
+  ~org-publish-sitemap-date-format~ which defaults to ~%Y-%m-%d~.
+
 *** Generating an index
 :PROPERTIES:
 :DESCRIPTION: An index that reaches across pages.
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index e1d40d8632f..705ab62d69d 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{9.6.19}
+\def\orgversionnumber{9.6.15}
 \def\versionyear{2023}          % latest update
 \input emacsver.tex
 
diff --git a/lisp/org/ol-man.el b/lisp/org/ol-man.el
index d3d7db04700..b6cada1b3c3 100644
--- a/lisp/org/ol-man.el
+++ b/lisp/org/ol-man.el
@@ -39,27 +39,13 @@
   :group 'org-link
   :type '(choice (const man) (const woman)))
 
-(declare-function Man-translate-references "man" (ref))
 (defun org-man-open (path _)
   "Visit the manpage on PATH.
 PATH should be a topic that can be thrown at the man command.
 If PATH contains extra ::STRING which will use `occur' to search
 matched strings in man buffer."
-  (require 'man) ; For `Man-translate-references'
   (string-match "\\(.*?\\)\\(?:::\\(.*\\)\\)?$" path)
   (let* ((command (match-string 1 path))
-         ;; FIXME: Remove after we drop Emacs 29 support.
-         ;; Working around security bug #66390.
-         (command (if (not (equal (Man-translate-references ";id") ";id"))
-                      ;; We are on Emacs that escapes man command args
-                      ;; (see Emacs commit 820f0793f0b).
-                      command
-                    ;; Older Emacs without the fix - escape the
-                    ;; arguments ourselves.
-                    (mapconcat 'identity
-                               (mapcar #'shell-quote-argument
-                                       (split-string command "\\s-+"))
-                               " ")))
          (search (match-string 2 path))
          (buffer (funcall org-man-command command)))
     (when search
diff --git a/lisp/org/ol.el b/lisp/org/ol.el
index c3b03087842..4c84e62f4c9 100644
--- a/lisp/org/ol.el
+++ b/lisp/org/ol.el
@@ -291,7 +291,10 @@ or emacs-wiki packages to Org syntax.
 The function must accept two parameters, a TYPE containing the link
 protocol name like \"rmail\" or \"gnus\" as a string, and the linked path,
 which is everything after the link protocol.  It should return a cons
-with possibly modified values of type and path."
+with possibly modified values of type and path.
+Org contains a function for this, so if you set this variable to
+`org-translate-link-from-planner', you should be able follow many
+links created by planner."
   :group 'org-link-follow
   :type '(choice (const nil) (function))
   :safe #'null)
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index c17a100d3c1..33a510cd7f2 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -664,7 +664,7 @@ You could use brackets to delimit on what part the link will be.
 
 %t is the title.
 %a is the author.
-%d is the date."
+%d is the date formatted using `org-publish-sitemap-date-format'."
   :group 'org-export-publish
   :type 'string)
 (make-obsolete-variable
diff --git a/lisp/org/org-id.el b/lisp/org/org-id.el
index fe7d5f4c1a5..9561f2de184 100644
--- a/lisp/org/org-id.el
+++ b/lisp/org/org-id.el
@@ -29,13 +29,13 @@
 ;; are provided that create and retrieve such identifiers, and that find
 ;; entries based on the identifier.
 
-;; Identifiers consist of a prefix (given by the variable
+;; Identifiers consist of a prefix (default "Org" given by the variable
 ;; `org-id-prefix') and a unique part that can be created by a number
-;; of different methods, see the variable `org-id-method'.  Org has a
-;; builtin method that uses a compact encoding of the creation time of
-;; the ID, with microsecond accuracy.  This virtually guarantees
-;; globally unique identifiers, even if several people are creating
-;; IDs at the same time in files that will eventually be used
+;; of different methods, see the variable `org-id-method'.
+;; Org has a builtin method that uses a compact encoding of the creation
+;; time of the ID, with microsecond accuracy.  This virtually
+;; guarantees globally unique identifiers, even if several people are
+;; creating IDs at the same time in files that will eventually be used
 ;; together.
 ;;
 ;; By default Org uses UUIDs as global unique identifiers.
diff --git a/lisp/org/org-lint.el b/lisp/org/org-lint.el
index a503de7d364..dc12ec272fa 100644
--- a/lisp/org/org-lint.el
+++ b/lisp/org/org-lint.el
@@ -1209,11 +1209,8 @@ Use \"export %s\" instead"
                   (`(,(and (pred symbolp) name)
                      ,(pred string-or-null-p)
                      ,(pred string-or-null-p))
-                   (unless (or (org-cite-get-processor name)
-                               (progn
-                                 (org-cite-try-load-processor name)
-                                 (org-cite-get-processor name)))
-                     (list source (format "Unknown cite export processor %S" name))))
+                   (unless (org-cite-get-processor name)
+                     (list source "Unknown cite export processor %S" name)))
                   (_
                    (list source "Invalid cite export processor declaration")))
               (error
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 92490f9f6bf..6408f48ccbd 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -1922,8 +1922,8 @@ However, when N is 0, do not increment the field at all."
       (let ((org-table-may-need-update nil)) (org-table-next-row))
       (org-table-blank-field))
     ;; Insert the new field.  NEW-FIELD may be nil if
-    ;; `org-table-copy-increment' is nil, or N = 0.  In that case,
-    ;; copy FIELD.
+    ;; `org-table-increment' is nil, or N = 0.  In that case, copy
+    ;; FIELD.
     (insert (or next-field field))
     (org-table-maybe-recalculate-line)
     (org-table-align)))
@@ -4084,8 +4084,8 @@ already hidden."
   "Read column selection select as a list of numbers.
 
 SELECT is a string containing column ranges, separated by white
-space characters, see `org-table-toggle-column-width' for details.
-MAX is the maximum column number.
+space characters, see `org-table-hide-column' for details.  MAX
+is the maximum column number.
 
 Return value is a sorted list of numbers.  Ignore any number
 outside of the [1;MAX] range."
diff --git a/lisp/org/org-tempo.el b/lisp/org/org-tempo.el
index afa69867f2a..44b04a9f4be 100644
--- a/lisp/org/org-tempo.el
+++ b/lisp/org/org-tempo.el
@@ -24,7 +24,7 @@
 ;;; Commentary:
 ;;
 ;; Org Tempo reimplements completions of structure template before
-;; point in Org v9.1 and earlier.
+;; point like `org-try-structure-completion' in Org v9.1 and earlier.
 ;; For example, strings like "<e" at the beginning of the line will be
 ;; expanded to an example block.
 ;;
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 06af985ffb9..b41756ac53e 100644
--- 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.19"))
+   (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.19"))
+   (let ((org-git-version "release_9.6.15"))
      org-git-version))
 
 (provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 231ed094b36..3075729d01d 100644
--- 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.19
+;; Version: 9.6.15
 
 ;; This file is part of GNU Emacs.
 ;;
@@ -4685,7 +4685,7 @@ returns non-nil if any of them match."
                               (if (and (= char ?f) current-file)
                                   (concat "file://" current-file) uri))
                              "\\'")))))
-          (prog1 (memq char '(?y ?! ?d ?\s ?f))
+          (prog1 (memq char '(?y ?n ?! ?d ?\s ?f))
             (quit-window t)))))))
 
 (defun org-extract-log-state-settings (x)
@@ -5524,9 +5524,7 @@ by a #."
 
 (defun org-fontify-extend-region (beg end _old-len)
   (let ((end (if (progn (goto-char end) (looking-at-p "^[*#]"))
-                 (min (point-max) (1+ end))
-               ;; See `font-lock-extend-jit-lock-region-after-change' and bug#68849.
-               (min (point-max) (1+ end))))
+                 (1+ end) end))
         (begin-re "\\(\\\\\\[\\|\\(#\\+begin_\\|\\\\begin{\\)\\S-+\\)")
         (end-re "\\(\\\\\\]\\|\\(#\\+end_\\|\\\\end{\\)\\S-+\\)")
         (extend
@@ -9337,7 +9335,7 @@ When called through ELisp, arg is also interpreted in the following way:
               (unless (org-invisible-p (line-beginning-position))
                 (org-fold-region (line-beginning-position)
                                  (line-end-position)
-                                 nil 'outline)))
+                                 nil)))
             (cond ((and org-state (equal this org-state))
                    (message "TODO state was already %s" (org-trim next)))
                   ((not (pos-visible-in-window-p hl-pos))
diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el
index 7b5308b5bf0..c83728a8f09 100644
--- a/lisp/org/ox-latex.el
+++ b/lisp/org/ox-latex.el
@@ -600,9 +600,8 @@ which is replaced with the subtitle."
 
 (defcustom org-latex-toc-command "\\tableofcontents\n\n"
   "LaTeX command to set the table of contents, list of figures, etc.
-This command only applies to the table of contents generated with the
-toc:t, toc:1, toc:2, toc:3, ... options, not to those generated with
-the #+TOC keyword."
+This command only applies to the table of contents generated with
+the toc:nil option, not to those generated with #+TOC keyword."
   :group 'org-export-latex
   :type 'string)
 
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el
index 0b455d61b14..2c70d1dea27 100644
--- a/lisp/org/ox-odt.el
+++ b/lisp/org/ox-odt.el
@@ -3254,9 +3254,8 @@ Return a cons of (TABLE-CELL-STYLE-NAME . PARAGRAPH-STYLE-NAME).
 
 When STYLE-SPEC is nil, style the table cell the conventional way
 - choose cell borders based on row and column groupings and
-choose paragraph alignment based on table alignment cookies (see info
-node `(org)Column Width and Alignment').  See also
-`org-odt-table-style-spec'.
+choose paragraph alignment based on `org-col-cookies' text
+property.  See also `org-odt-table-style-spec'.
 
 When STYLE-SPEC is non-nil, ignore the above cookie and return
 styles congruent with the ODF-1.2 specification."
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 5a02b073c1a..b8050bcda5c 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -1626,10 +1626,11 @@ BLOB is the element or object considered."
 ;; `org-export--collect-tree-properties'.
 ;;
 ;; Dedicated functions focus on computing the value of specific tree
-;; properties during initialization.  Thus, `org-export--prune-tree'
-;; lists elements and objects that should be skipped during export,
-;; `org-export--get-min-level' gets the minimal exportable level, used
-;; as a basis to compute relative level for headlines.  Eventually
+;; properties during initialization.  Thus,
+;; `org-export--populate-ignore-list' lists elements and objects that
+;; should be skipped during export, `org-export--get-min-level' gets
+;; the minimal exportable level, used as a basis to compute relative
+;; level for headlines.  Eventually
 ;; `org-export--collect-headline-numbering' builds an alist between
 ;; headlines and their numbering.