diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-06-27 06:30:25 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-06-27 06:30:25 +0200 |
| commit | 087476bce183a404b2a7e62b15b5033504cb4819 (patch) | |
| tree | 9e3036a0ef00c13a2c8b84d2ab5027a521134b92 /lisp/org | |
| parent | 677d740e14adc30a8544220b9c49ea9c1527182b (diff) | |
| parent | 48bda83d3591d33c5bb8292d9edb06ef3c3f93bd (diff) | |
| download | emacs-087476bce183a404b2a7e62b15b5033504cb4819.tar.gz emacs-087476bce183a404b2a7e62b15b5033504cb4819.tar.bz2 emacs-087476bce183a404b2a7e62b15b5033504cb4819.zip | |
Merge from origin/emacs-28
48bda83d35 Update to Org 9.5.4-3-g6dc785
c66b90a534 Mention Solaris 10 'make clean' and 'make check'
ade34cf821 Mention further crashes on Solaris 10
Diffstat (limited to 'lisp/org')
| -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) |