emacs-29 b1b3af5b90b: Update to Org 9.6.1-40-g3d817c

[Kyle Meyer]

branch: emacs-29
commit b1b3af5b90ba6f5416dfaf60e33729b32ca2f195
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    Update to Org 9.6.1-40-g3d817c
---
 doc/misc/org.org         |  3 ++-
 etc/refcards/orgcard.tex |  4 +--
 lisp/org/org-clock.el    | 10 +++++---
 lisp/org/org-version.el  |  2 +-
 lisp/org/org.el          | 64 ++++++++++++++++++++++++++----------------------
 5 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/doc/misc/org.org b/doc/misc/org.org
index ad889a5c622..7ff0933de75 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -18096,7 +18096,8 @@ evaluating untrusted code blocks by prompting for a 
confirmation.
 
 - =yes= ::
 
-  Org always evaluates the source code without asking permission.
+  Org evaluates the source code, possibly asking permission according
+  to ~org-confirm-babel-evaluate~.
 
 - =never= or =no= ::
 
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 093dfceafa7..dc222719b7e 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,6 +1,6 @@
 % Reference Card for Org Mode
 \def\orgversionnumber{9.6.1}
-\def\versionyear{2021}          % latest update
+\def\versionyear{2023}          % latest update
 \input emacsver.tex
 
 %**start of header
@@ -329,7 +329,7 @@
 \key{archive subtree using the default command}{C-c C-x C-a}
 \key{move subtree to archive file}{C-c C-x C-s}
 \key{toggle ARCHIVE tag / to ARCHIVE sibling}{C-c C-x a/A}
-\key{force cycling of an ARCHIVEd tree}{C-TAB}
+\key{force cycling of an ARCHIVEd tree}{C-c C-TAB}
 
 \section{Filtering and Sparse Trees}
 
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 55372e5649b..f9daf3f14d8 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -726,9 +726,9 @@ If not, show simply the clocked time like 01:50."
                                'org-mode-line-clock-overrun
                              'org-mode-line-clock)))
               (effort-str (org-duration-from-minutes effort-in-minutes)))
-         (format (propertize " [%s/%s] (%s)" 'face 'org-mode-line-clock)
+         (format (propertize "[%s/%s] (%s) " 'face 'org-mode-line-clock)
                  work-done-str effort-str org-clock-heading))
-      (format (propertize " [%s] (%s)" 'face 'org-mode-line-clock)
+      (format (propertize "[%s] (%s) " 'face 'org-mode-line-clock)
              (org-duration-from-minutes clocked-time)
              org-clock-heading))))
 
@@ -1798,7 +1798,11 @@ Optional argument N tells to change by that many units."
              (begts (if updatets1 begts1 begts2)))
          (setq tdiff
                (time-subtract
-                (org-time-string-to-time org-last-changed-timestamp)
+                (org-time-string-to-time
+                  (save-excursion
+                    (goto-char (if updatets1 begts2 begts1))
+                    (looking-at org-ts-regexp3)
+                    (match-string 0)))
                 (org-time-string-to-time ts)))
           ;; `save-excursion' won't work because
           ;; `org-timestamp-change' deletes and re-inserts the
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 5f93356709e..a8a13152dc8 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.6.1-34-geea8da"))
+   (let ((org-git-version "release_9.6.1-40-g3d817c"))
      org-git-version))
 
 (provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 9a4f7803cf4..2fbb825015f 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -297,47 +297,49 @@ default, only Emacs Lisp is loaded, since it has no 
specific
 requirement."
   :group 'org-babel
   :set 'org-babel-do-load-languages
-  :version "24.1"
+  :package-version '(Org . "9.6")
   :type '(alist :tag "Babel Languages"
                :key-type
                (choice
                 (const :tag "Awk" awk)
-                (const :tag "C" C)
+                (const :tag "C, D, C++, and cpp" C)
                 (const :tag "R" R)
                  (const :tag "Calc" calc)
-                (const :tag "Clojure" clojure)
+                (const :tag "Clojure and ClojureScript" clojure)
                 (const :tag "CSS" css)
                 (const :tag "Ditaa" ditaa)
                 (const :tag "Dot" dot)
                  (const :tag "Emacs Lisp" emacs-lisp)
+                 (const :tag "Eshell" eshell)
                 (const :tag "Forth" forth)
                 (const :tag "Fortran" fortran)
-                (const :tag "Gnuplot" gnuplot)
+                (const :tag "GnuPlot" gnuplot)
+                (const :tag "Groovy" groovy)
                 (const :tag "Haskell" haskell)
                  (const :tag "Java" java)
-                (const :tag "Javascript" js)
-                (const :tag "LaTeX" latex)
-                 (const :tag "Lilypond" lilypond)
+                (const :tag "JavaScript" js)
+                 (const :tag "Julia" julia)
+                 (const :tag "LaTeX" latex)
+                 (const :tag "LilyPond" lilypond)
                 (const :tag "Lisp" lisp)
+                 (const :tag "Lua" lua)
                 (const :tag "Makefile" makefile)
                 (const :tag "Maxima" maxima)
-                (const :tag "Matlab" matlab)
-                 (const :tag "Ocaml" ocaml)
-                (const :tag "Octave" octave)
+                 (const :tag "OCaml" ocaml)
+                (const :tag "Octave and MatLab" octave)
                 (const :tag "Org" org)
                 (const :tag "Perl" perl)
-                (const :tag "Pico Lisp" picolisp)
+                 (const :tag "Processing" processing)
                 (const :tag "PlantUML" plantuml)
                 (const :tag "Python" python)
                 (const :tag "Ruby" ruby)
                 (const :tag "Sass" sass)
-                (const :tag "Scala" scala)
                 (const :tag "Scheme" scheme)
                 (const :tag "Screen" screen)
+                 (const :tag "Sed" sed)
                 (const :tag "Shell Script" shell)
                  (const :tag "Sql" sql)
-                (const :tag "Sqlite" sqlite)
-                (const :tag "Stan" stan))
+                (const :tag "Sqlite" sqlite))
                :value-type (boolean :tag "Activate" :value t)))
 
 ;;;; Customization variables
@@ -4559,21 +4561,25 @@ is available.  This option applies only if FILE is a 
URL."
      (cache)
      (is-url
       (if (org--should-fetch-remote-resource-p file)
-          (with-current-buffer (url-retrieve-synchronously file)
-            (goto-char (point-min))
-            ;; Move point to after the url-retrieve header.
-            (search-forward "\n\n" nil :move)
-            ;; Search for the success code only in the url-retrieve header.
-            (if (save-excursion
-                  (re-search-backward "HTTP.*\\s-+200\\s-OK" nil :noerror))
-                ;; Update the cache `org--file-cache' and return contents.
-                (puthash file
-                         (buffer-substring-no-properties (point) (point-max))
-                         org--file-cache)
-              (funcall (if noerror #'message #'user-error)
-                       "Unable to fetch file from %S"
-                       file)
-              nil))
+          (condition-case error
+              (with-current-buffer (url-retrieve-synchronously file)
+                (goto-char (point-min))
+                ;; Move point to after the url-retrieve header.
+                (search-forward "\n\n" nil :move)
+                ;; Search for the success code only in the url-retrieve header.
+                (if (save-excursion
+                      (re-search-backward "HTTP.*\\s-+200\\s-OK" nil :noerror))
+                    ;; Update the cache `org--file-cache' and return contents.
+                    (puthash file
+                             (buffer-substring-no-properties (point) 
(point-max))
+                             org--file-cache)
+                  (funcall (if noerror #'message #'user-error)
+                           "Unable to fetch file from %S"
+                           file)
+                  nil))
+            (error (if noerror
+                       (message "Org could't download \"%s\": %s %S" file (car 
error) (cdr error))
+                     (signal (car error) (cdr error)))))
         (funcall (if noerror #'message #'user-error)
                  "The remote resource %S is considered unsafe, and will not be 
downloaded."
                  file)))