Merge from origin/emacs-28

d4e2850b32 Update to Org 9.5.2-3-geb9f34

4 files changed, 20 insertions, 10 deletions

diff --git a/lisp/org/ob-gnuplot.el b/lisp/org/ob-gnuplot.el
index 8c4a5957b99..17af2ae5b0c 100644
--- a/lisp/org/ob-gnuplot.el
+++ b/lisp/org/ob-gnuplot.el
@@ -284,14 +284,25 @@ then create one.  Return the initialized session.  The current
 (defun org-babel-gnuplot-table-to-data (table data-file params)
   "Export TABLE to DATA-FILE in a format readable by gnuplot.
 Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE."
+  (require 'ox-org)
   (with-temp-file data-file
     (insert (let ((org-babel-gnuplot-timestamp-fmt
                    (or (plist-get params :timefmt) "%Y-%m-%d-%H:%M:%S")))
-              (orgtbl-to-generic
-               table
-               (org-combine-plists
-                '(:sep "\t" :fmt org-babel-gnuplot-quote-tsv-field :raw t :backend ascii)
-                params)))))
+              (replace-regexp-in-string
+               ;; org export backend adds "|" at the beginning/end of
+               ;; the table lines.  Strip those.
+               "^|\\(.+\\)|$"
+               "\\1"
+               (orgtbl-to-generic
+                table
+                (org-combine-plists
+                 '( :sep "\t" :fmt org-babel-gnuplot-quote-tsv-field
+                    ;; Two setting below are needed to make :fmt work.
+                    :raw t
+                    ;; Use `org', not `ascii' because `ascii' may
+                    ;; sometimes mishandle quoted strings.
+                    :backend org)
+                 params))))))
   data-file)
 
 (provide 'ob-gnuplot)
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 2526ca793aa..2cd9fc56d36 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -1746,7 +1746,7 @@ Optional argument N tells to change by that many units."
   (org-clock-timestamps-change 'up n))
 
 (defun org-clock-timestamps-down (&optional n)
-  "Increase CLOCK timestamps at cursor.
+  "Decrease CLOCK timestamps at cursor.
 Optional argument N tells to change by that many units."
   (interactive "P")
   (org-clock-timestamps-change 'down n))
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 514f82ea4a5..1053bbe22cc 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -5,13 +5,13 @@
 (defun org-release ()
   "The release version of Org.
 Inserted by installing Org mode or when a release is made."
-   (let ((org-release "9.5.1"))
+   (let ((org-release "9.5.2"))
      org-release))
 ;;;###autoload
 (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.1-31-ga18849"))
+   (let ((org-git-version "release_9.5.2-3-geb9f34"))
      org-git-version))
 
 (provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index bddc319bf6a..e54bccdf2ec 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -9,7 +9,7 @@
 ;; Homepage: https://orgmode.org
 ;; Package-Requires: ((emacs "25.1"))
 
-;; Version: 9.5.1
+;; Version: 9.5.2
 
 ;; This file is part of GNU Emacs.
 ;;
@@ -5114,7 +5114,6 @@ stacked delimiters is N.  Escaping delimiters is not possible."
                                      '(invisible t))
                 (add-text-properties (match-beginning 3) (match-end 3)
                                      '(invisible t)))
-              (goto-char (match-end 0))
               (throw :exit t))))))))
 
 (defun org-emphasize (&optional char)