mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

ox: Regain Emacs <28 compatibility with #+include 

* lisp/ox.el (org-export-expand-include-keyword): Replace the (pred (not
FUN)) `pcase' form introduced in Emacs 28 with a simple `cond' statement.
This commit is contained in:
TEC 2023-01-23 23:07:00 +08:00
parent 77a1cfb9a4
commit 2fecd96200
Signed by: tec
SSH Key Fingerprint: SHA256:eobz41Mnm0/iYWBvWThftS0ElEs1ftBr6jamutnXc/A
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lisp/ox.el
View File

@ -3323,34 +3323,35 @@ not have `buffer-file-name' assigned."
(beginning-of-line)
;; Extract arguments from keyword's value.
(let* ((value (org-element-property :value element))
(parameters (org-export-parse-include-value value dir)))
(parameters (org-export-parse-include-value value dir))
(file (plist-get parameters :file)))
;; Remove keyword.
(delete-region (point) (line-beginning-position 2))
(pcase (plist-get parameters :file)
((pred not) nil)
((and (pred (not org-url-p)) (pred (not file-readable-p)) f)
(error "Cannot include file %s" f))
;; Check if files has already been parsed. Look after
;; inclusion lines too, as different parts of the same
;; file can be included too.
((and f (guard (member (list f (plist-get parameters :lines))
included)))
(error "Recursive file inclusion: %s" f))
(_
(org-export--blindly-expand-include
parameters
:includer-file includer-file
:file-prefix file-prefix
:footnotes footnotes
:already-included included)
;; Expand footnotes after all files have been
;; included. Footnotes are stored at end of buffer.
(unless included
(org-with-wide-buffer
(goto-char (point-max))
(maphash (lambda (k v)
(insert (format "\n[fn:%s] %s\n" k v)))
footnotes))))))))))))
(cond
((not file)) ; Do nothing.
((and (not (org-url-p file))
(not (file-readable-p file)))
(error "Cannot include file %s" file))
;; Check if files has already been parsed. Look after
;; inclusion lines too, as different parts of the same
;; file can be included too.
((member (list file (plist-get parameters :lines)) included)
(error "Recursive file inclusion: %s" f))
(t
(org-export--blindly-expand-include
parameters
:includer-file includer-file
:file-prefix file-prefix
:footnotes footnotes
:already-included included)
;; Expand footnotes after all files have been
;; included. Footnotes are stored at end of buffer.
(unless included
(org-with-wide-buffer
(goto-char (point-max))
(maphash (lambda (k v)
(insert (format "\n[fn:%s] %s\n" k v)))
footnotes))))))))))))
(defun org-export-parse-include-value (value &optional dir)
"Extract the various parameters from #+include: VALUE.