diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2022-06-26 23:00:38 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2022-06-26 23:00:38 -0400 |
| commit | 48bda83d3591d33c5bb8292d9edb06ef3c3f93bd (patch) | |
| tree | 8bc0d0cf05499fc5c237aa0cd0d40769689d4e7e | |
| parent | c66b90a534ed08762d57f8f78224dbd6dd6a1b68 (diff) | |
| download | emacs-48bda83d3591d33c5bb8292d9edb06ef3c3f93bd.tar.gz | |
Update to Org 9.5.4-3-g6dc785
| -rw-r--r-- | lisp/org/oc-basic.el | 9 | ||||
| -rw-r--r-- | lisp/org/org-version.el | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/org/oc-basic.el b/lisp/org/oc-basic.el index 775690f1767..9ed1b810fab 100644 --- a/lisp/org/oc-basic.el +++ b/lisp/org/oc-basic.el @@ -189,7 +189,14 @@ Return a hash table with citation references as keys and fields alist as values. (cons 'year (cond ((consp date) - (caar date)) + (let ((year (caar date))) + (cond + ((numberp year) (number-to-string year)) + ((stringp year) year) + (t + (error + "First element of CSL-JSON date-parts should be a number or string, got %s: %S" + (type-of year) year))))) ((stringp date) (replace-regexp-in-string (rx diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index 6bdcb0afff5..2a500fe5106 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el @@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made." (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.5.4")) + (let ((org-git-version "release_9.5.4-3-g6dc785")) org-git-version)) (provide 'org-version) |