master 1de7382b57: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 1de7382b574ff9f40319d7a075d952cb944f96ca
Merge: 0f3ce51a0d e77fc8262a
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    e77fc8262a Update to Org 9.5.2-22-g33543d
    9bce4b67f1 ; * lisp/help.el (with-help-window): Doc fix.  (Bug#54170)
    558b03a958 Add explicit '--no-heading' for ripgrep
---
 lisp/help.el            |  4 ++--
 lisp/org/oc-basic.el    | 20 ++++++++++++++------
 lisp/org/ol.el          |  2 +-
 lisp/org/org-version.el |  2 +-
 lisp/org/org.el         | 10 +++++-----
 lisp/progmodes/xref.el  |  2 +-
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/lisp/help.el b/lisp/help.el
index 975be497e7..d60b586779 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1929,8 +1929,8 @@ Return VALUE."
 ;;     window to an arbitrary buffer position.
 (defmacro with-help-window (buffer-or-name &rest body)
   "Evaluate BODY, send output to BUFFER-OR-NAME and show in a help window.
-This construct is like `with-temp-buffer-window' but unlike that
-puts the buffer specified by BUFFER-OR-NAME in `help-mode' and
+This construct is like `with-temp-buffer-window', which see, but unlike
+that, it puts the buffer specified by BUFFER-OR-NAME in `help-mode' and
 displays a message about how to delete the help window when it's no
 longer needed.  The help window will be selected if
 `help-window-select' is non-nil.
diff --git a/lisp/org/oc-basic.el b/lisp/org/oc-basic.el
index d82406affb..81b7e4471f 100644
--- a/lisp/org/oc-basic.el
+++ b/lisp/org/oc-basic.el
@@ -178,21 +178,29 @@ Return a hash table with citation references as keys and 
fields alist as values.
                                      " and ")))
                              ('issued
                               ;; Date are expressed as an array
-                              ;; (`date-parts') or a "string (`raw').
-                              ;; In both cases, extract the year and
-                              ;; associate it to `year' field, for
-                              ;; compatibility with BibTeX format.
+                              ;; (`date-parts') or a "string (`raw'
+                              ;; or `literal'). In both cases,
+                              ;; extract the year and associate it
+                              ;; to `year' field, for compatibility
+                              ;; with BibTeX format.
                               (let ((date (or (alist-get 'date-parts value)
+                                              (alist-get 'literal value)
                                               (alist-get 'raw value))))
                                 (cons 'year
                                       (cond
                                        ((consp date)
                                         (caar date))
                                        ((stringp date)
-                                        (car (split-string date "-")))
+                                        (replace-regexp-in-string
+                                          (rx
+                                            (minimal-match (zero-or-more 
anything))
+                                            (group-n 1 (repeat 4 digit))
+                                            (zero-or-more anything))
+                                          (rx (backref 1))
+                                          date))
                                        (t
                                         (error "Unknown CSL-JSON date format: 
%S"
-                                               date))))))
+                                               value))))))
                              (_
                               (cons field value))))
                          item)
diff --git a/lisp/org/ol.el b/lisp/org/ol.el
index 2951c3def1..905e491f4a 100644
--- a/lisp/org/ol.el
+++ b/lisp/org/ol.el
@@ -183,7 +183,7 @@ link.
 (defcustom org-link-descriptive t
   "Non-nil means Org displays descriptive links.
 
-E.g. [[https://orgmode.org][Org website]] is be displayed as
+E.g. [[https://orgmode.org][Org website]] is displayed as
 \"Org Website\", hiding the link itself and just displaying its
 description.  When set to nil, Org displays the full links
 literally.
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 6a2aa8ca5b..badf0e4769 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.2-17-gea6b74"))
+   (let ((org-git-version "release_9.5.2-22-g33543d"))
      org-git-version))
 
 (provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index f5d4df3d9c..67c8f1cedf 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -17522,11 +17522,11 @@ this numeric value."
   (interactive "r")
   (let ((result ""))
     (while (/= beg end)
-      (when (get-char-property beg 'invisible)
-       (setq beg (next-single-char-property-change beg 'invisible nil end)))
-      (let ((next (next-single-char-property-change beg 'invisible nil end)))
-       (setq result (concat result (buffer-substring beg next)))
-       (setq beg next)))
+      (if (invisible-p beg)
+          (setq beg (next-single-char-property-change beg 'invisible nil end))
+        (let ((next (next-single-char-property-change beg 'invisible nil end)))
+          (setq result (concat result (buffer-substring beg next)))
+          (setq beg next))))
     (setq deactivate-mark t)
     (kill-new result)
     (message "Visible strings have been copied to the kill ring.")))
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 5b27c83584..96c1609b34 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -1714,7 +1714,7 @@ IGNORES is a list of glob patterns for files to ignore."
     (ripgrep
      .
      ;; '!*/' is there to filter out dirs (e.g. submodules).
-     "xargs -0 rg <C> --null -nH --no-messages -g '!*/' -e <R>"
+     "xargs -0 rg <C> --null -nH --no-heading --no-messages -g '!*/' -e <R>"
      ))
   "Associative list mapping program identifiers to command templates.