master 087476bce1 3/3: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 087476bce183a404b2a7e62b15b5033504cb4819
Merge: 677d740e14 48bda83d35
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    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
---
 etc/PROBLEMS            | 11 +++++++++++
 lisp/org/oc-basic.el    |  9 ++++++++-
 lisp/org/org-version.el |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 88382f93d0..c924f5f394 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2548,6 +2548,17 @@ Emacs so that it isn't compiled with '-O5'.
 We list bugs in current versions here.  See also the section on legacy
 systems.
 
+*** On Solaris 10, 'make clean' and 'make check' do not work.
+The Emacs build procedure uses ’find ... -path ...', which Solaris 10
+'find' does not support.  You can work around the problem by
+installing GNU 'find' in your PATH.  This problem should be fixed in
+Emacs 29.
+
+*** On Solaris 10 sparc, Emacs crashes during the build while saving state.
+This was observed for Emacs 28.1 on Solaris 10 32-bit sparc, with
+Oracle Developer Studio 12.6 (Sun C 5.15).  The failure was intermittent,
+and running GNU Make a second time would typically finish the build.
+
 *** On Solaris 10, Emacs crashes during the build process.
 (This applies only with './configure --with-unexec=yes', which is rare.)
 This was reported for Emacs 25.2 on i386-pc-solaris2.10 with Sun
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)