[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-28 48bda83d35: Update to Org 9.5.4-3-g6dc785
From: |
Kyle Meyer |
Subject: |
emacs-28 48bda83d35: Update to Org 9.5.4-3-g6dc785 |
Date: |
Sun, 26 Jun 2022 23:13:50 -0400 (EDT) |
branch: emacs-28
commit 48bda83d3591d33c5bb8292d9edb06ef3c3f93bd
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>
Update to Org 9.5.4-3-g6dc785
---
lisp/org/oc-basic.el | 9 ++++++++-
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 775690f176..9ed1b810fa 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 6bdcb0afff..2a500fe510 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-28 48bda83d35: Update to Org 9.5.4-3-g6dc785,
Kyle Meyer <=