From ede8294cf74d9cff9c53ee2aa0cf311005796597 Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Mon, 22 Jan 2024 12:25:04 +0100 Subject: [PATCH 1/9] lisp/ox.el: Fix removed variable in the commentary Reported-by: Stefan Kangas Link: https://orgmode.org/list/CADwFkmnsjEg+d7ty0bjT5RGQiS-SdKcvRUy+KHDh+maa92bp1w@mail.gmail.com --- lisp/ox.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lisp/ox.el b/lisp/ox.el index b8050bcda..5a02b073c 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -1626,11 +1626,10 @@ 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--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 +;; 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 ;; `org-export--collect-headline-numbering' builds an alist between ;; headlines and their numbering. From 4aced687b8eea522399e1afcc02b4dfa7176fb6e Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Wed, 24 Jan 2024 13:24:02 +0100 Subject: [PATCH 2/9] lisp/org-tempo.el: Do not refer to removed function in the commentary Reported-by: Stefan Kangas Link: https://orgmode.org/list/CADwFkmnsjEg+d7ty0bjT5RGQiS-SdKcvRUy+KHDh+maa92bp1w@mail.gmail.com --- lisp/org-tempo.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-tempo.el b/lisp/org-tempo.el index 44b04a9f4..afa69867f 100644 --- a/lisp/org-tempo.el +++ b/lisp/org-tempo.el @@ -24,7 +24,7 @@ ;;; Commentary: ;; ;; Org Tempo reimplements completions of structure template before -;; point like `org-try-structure-completion' in Org v9.1 and earlier. +;; point in Org v9.1 and earlier. ;; For example, strings like " Date: Thu, 25 Jan 2024 15:22:22 +0100 Subject: [PATCH 3/9] org-link-translation-function: Remove reference to removed function * lisp/ol.el (org-link-translation-function): Remove reference to no-longer-available `org-translate-link-from-planner' from the docstring. Reported-by: Stefan Kangas Link: https://orgmode.org/list/CADwFkmnsjEg+d7ty0bjT5RGQiS-SdKcvRUy+KHDh+maa92bp1w@mail.gmail.com --- lisp/ol.el | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lisp/ol.el b/lisp/ol.el index 4c84e62f4..c3b030878 100644 --- a/lisp/ol.el +++ b/lisp/ol.el @@ -291,10 +291,7 @@ 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. -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." +with possibly modified values of type and path." :group 'org-link-follow :type '(choice (const nil) (function)) :safe #'null) From 75b6f2712a874c0202cce23062070b6e1572065b Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Fri, 26 Jan 2024 15:04:19 +0100 Subject: [PATCH 4/9] lisp/org-table.el (org-table-copy-down): Fix typo --- lisp/org-table.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org-table.el b/lisp/org-table.el index 6408f48cc..7de7dfdfc 100644 --- a/lisp/org-table.el +++ b/lisp/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-increment' is nil, or N = 0. In that case, copy - ;; FIELD. + ;; `org-table-copy-increment' is nil, or N = 0. In that case, + ;; copy FIELD. (insert (or next-field field)) (org-table-maybe-recalculate-line) (org-table-align))) From ad90ff7cb2e693068519a5d7d9786709bedc9b13 Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Sun, 28 Jan 2024 14:48:57 +0100 Subject: [PATCH 5/9] lisp/org-table.el: Fix reference to non-existing function * lisp/org-table.el (org-table--read-column-selection): Fix the docstring, pointing to the right function that explains the format of SELECT argument. Reported-by: Stefan Kangas Link: https://orgmode.org/list/CADwFkmnsjEg+d7ty0bjT5RGQiS-SdKcvRUy+KHDh+maa92bp1w@mail.gmail.com --- lisp/org-table.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org-table.el b/lisp/org-table.el index 7de7dfdfc..92490f9f6 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -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-hide-column' for details. MAX -is the maximum column number. +space characters, see `org-table-toggle-column-width' 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." From f1978ede2962cb93199c53d78f0e2a2e925845f6 Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Mon, 29 Jan 2024 14:38:01 +0100 Subject: [PATCH 6/9] org-odt-get-table-cell-styles: Fix reference to obsolete text property * lisp/ox-odt.el (org-odt-get-table-cell-styles): Remove reference to long-obsolete text property used to store table alignment info. Instead, refer to table alignment cookies described in the manual. Reported-by: Stefan Kangas Link: https://orgmode.org/list/CADwFkmnsjEg+d7ty0bjT5RGQiS-SdKcvRUy+KHDh+maa92bp1w@mail.gmail.com --- lisp/ox-odt.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el index 2c70d1dea..0b455d61b 100644 --- a/lisp/ox-odt.el +++ b/lisp/ox-odt.el @@ -3254,8 +3254,9 @@ 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 `org-col-cookies' text -property. See also `org-odt-table-style-spec'. +choose paragraph alignment based on table alignment cookies (see info +node `(org)Column Width and Alignment'). 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." From ee0196e6afd20bef522dd552770fb4df5177f1cc Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Tue, 30 Jan 2024 13:39:57 +0100 Subject: [PATCH 7/9] doc/org-manual.org (Generating a sitemap): Link to `org-publish-project-alist' --- doc/org-manual.org | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/org-manual.org b/doc/org-manual.org index d91b2d69b..4f479ac1e 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -16712,6 +16712,7 @@ 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. From 28e38a47aa42ce1dcf8f8cdb02ddc40cae76869d Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Tue, 30 Jan 2024 13:40:11 +0100 Subject: [PATCH 8/9] doc/org-manual.org (Generating a sitemap): Fix property list * doc/org-manual.org (Generating a sitemap): Add missing :sitemap-style property description. Remove deprecated :sitemap-file-entry-format and :sitemap-date-format. Reported-by: Stefan Kangas Link: https://orgmode.org/list/CADwFkmnsjEg+d7ty0bjT5RGQiS-SdKcvRUy+KHDh+maa92bp1w@mail.gmail.com --- doc/org-manual.org | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/doc/org-manual.org b/doc/org-manual.org index 4f479ac1e..29e81be11 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -16730,6 +16730,12 @@ 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 @@ -16775,21 +16781,6 @@ 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. From d4eaf8fe5fdb3ec6225ccb3361a7f736fcc1c035 Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Tue, 30 Jan 2024 13:41:14 +0100 Subject: [PATCH 9/9] org-publish-sitemap-file-entry-format: Do not refer to non-existing symbol * lisp/org-compat.el (org-publish-sitemap-file-entry-format): Update the docstring. Reported-by: Stefan Kangas Link: https://orgmode.org/list/CADwFkmnsjEg+d7ty0bjT5RGQiS-SdKcvRUy+KHDh+maa92bp1w@mail.gmail.com --- lisp/org-compat.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 33a510cd7..c17a100d3 100644 --- a/lisp/org-compat.el +++ b/lisp/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 formatted using `org-publish-sitemap-date-format'." +%d is the date." :group 'org-export-publish :type 'string) (make-obsolete-variable