Merge branch 'bugfix'

This commit is contained in:
Ihor Radchenko 2022-12-10 08:49:30 +03:00
commit ca5f852750
No known key found for this signature in database
GPG key ID: 6470762A7DA11D8B

View file

@ -5728,31 +5728,32 @@ This may be either a string or a function of two arguments:
;; Initialize communication channel in INFO. ;; Initialize communication channel in INFO.
(with-temp-buffer (with-temp-buffer
(let ((org-inhibit-startup t)) (org-mode)) (let ((org-inhibit-startup t)) (org-mode))
(let ((standard-output (current-buffer)) (org-fold-core-ignore-modifications
(org-element-use-cache nil)) (let ((standard-output (current-buffer))
(dolist (e table) (org-element-use-cache nil))
(cond ((eq e 'hline) (princ "|--\n")) (dolist (e table)
((consp e) (cond ((eq e 'hline) (princ "|--\n"))
(princ "| ") (dolist (c e) (princ c) (princ " |")) ((consp e)
(princ "\n"))))) (princ "| ") (dolist (c e) (princ c) (princ " |"))
(org-element-cache-reset) (princ "\n")))))
;; Add back-end specific filters, but not user-defined ones. In (org-element-cache-reset)
;; particular, make sure to call parse-tree filters on the ;; Add back-end specific filters, but not user-defined ones. In
;; table. ;; particular, make sure to call parse-tree filters on the
(setq info ;; table.
(let ((org-export-filters-alist nil)) (setq info
(org-export-install-filters (let ((org-export-filters-alist nil))
(org-combine-plists (org-export-install-filters
(org-export-get-environment backend nil params) (org-combine-plists
`(:back-end ,(org-export-get-backend backend)))))) (org-export-get-environment backend nil params)
(setq data `(:back-end ,(org-export-get-backend backend))))))
(org-export-filter-apply-functions (setq data
(plist-get info :filter-parse-tree) (org-export-filter-apply-functions
(org-element-map (org-element-parse-buffer) 'table (plist-get info :filter-parse-tree)
#'identity nil t) (org-element-map (org-element-parse-buffer) 'table
info))) #'identity nil t)
(when (and backend (symbolp backend) (not (org-export-get-backend backend))) info))
(user-error "Unknown :backend value")) (when (and backend (symbolp backend) (not (org-export-get-backend backend)))
(user-error "Unknown :backend value"))))
(when (or (not backend) (plist-get info :raw)) (require 'ox-org)) (when (or (not backend) (plist-get info :raw)) (require 'ox-org))
;; Handle :skip parameter. ;; Handle :skip parameter.
(let ((skip (plist-get info :skip))) (let ((skip (plist-get info :skip)))