emacs-29 479626dbac9: Update to Org 9.6.3-2-gf2949d

[Kyle Meyer]

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

    Update to Org 9.6.3-2-gf2949d
---
 etc/refcards/orgcard.tex |  2 +-
 lisp/org/ob-comint.el    | 37 ++++++++++++++++---------------------
 lisp/org/org-version.el  |  4 ++--
 lisp/org/org.el          | 35 +++++++++++++++++------------------
 4 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 0ef05353341..f8894d9dc1c 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{9.6.2}
+\def\orgversionnumber{9.6.3}
 \def\versionyear{2023}          % latest update
 \input emacsver.tex
 
diff --git a/lisp/org/ob-comint.el b/lisp/org/ob-comint.el
index 54bf5127e16..adfe31c4008 100644
--- a/lisp/org/ob-comint.el
+++ b/lisp/org/ob-comint.el
@@ -81,19 +81,7 @@ or user `keyboard-quit' during execution of body."
        (let* ((string-buffer "")
              (comint-output-filter-functions
               (cons (lambda (text)
-                       (setq string-buffer
-                             (concat
-                              string-buffer
-                              ;; Upon concatenation, the prompt may no
-                              ;; longer match `comint-prompt-regexp'.
-                              ;; In particular, when the regexp has ^
-                              ;; and the output does not contain
-                              ;; trailing newline.  Use more reliable
-                              ;; match to split the output later.
-                              (replace-regexp-in-string
-                               comint-prompt-regexp
-                               ,org-babel-comint-prompt-separator
-                               text))))
+                       (setq string-buffer (concat string-buffer text)))
                     comint-output-filter-functions))
              dangling-text)
         ;; got located, and save dangling text
@@ -108,21 +96,28 @@ or user `keyboard-quit' during execution of body."
         (while (progn
                  (goto-char comint-last-input-end)
                  (not (save-excursion
-                        (and (re-search-forward
-                              (regexp-quote ,eoe-indicator) nil t)
-                             (re-search-forward
-                              comint-prompt-regexp nil t)))))
+                      (and (re-search-forward
+                            (regexp-quote ,eoe-indicator) nil t)
+                           (re-search-forward
+                            comint-prompt-regexp nil t)))))
           (accept-process-output (get-buffer-process (current-buffer))))
         ;; replace cut dangling text
         (goto-char (process-mark (get-buffer-process (current-buffer))))
         (insert dangling-text)
 
-         ;; Replace partially supplied input lines.
-         ;; This is needed when output filter spits partial lines that
-         ;; do not include a full prompt at a time.
+         ;; Filter out prompts.
          (setq string-buffer
                (replace-regexp-in-string
-                comint-prompt-regexp
+                ;; Sometimes, we get multiple agglomerated
+                ;; prompts together in a single output:
+                ;; "prompt prompt prompt output"
+                ;; Remove them progressively, so that
+                ;; possible "^" in the prompt regexp gets to
+                ;; work as we remove the heading prompt
+                ;; instance.
+                (if (string-prefix-p "^" comint-prompt-regexp)
+                    (format "^\\(%s\\)+" (substring comint-prompt-regexp 1))
+                  comint-prompt-regexp)
                 ,org-babel-comint-prompt-separator
                 string-buffer))
         ;; remove echo'd FULL-BODY from input
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index fd75f4785d6..43fdcb82832 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.6.2"))
+   (let ((org-release "9.6.3"))
      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.6.2"))
+   (let ((org-git-version "release_9.6.3-2-gf2949d"))
      org-git-version))
 
 (provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 1649722ab0c..be9d0e32dd0 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -9,7 +9,7 @@
 ;; URL: https://orgmode.org
 ;; Package-Requires: ((emacs "26.1"))
 
-;; Version: 9.6.2
+;; Version: 9.6.3
 
 ;; This file is part of GNU Emacs.
 ;;
@@ -3600,13 +3600,13 @@ following symbols:
               (const :tag "Entities" entities))))
 
 (defcustom org-hide-emphasis-markers nil
-  "Non-nil mean font-lock should hide the emphasis marker characters."
+  "Non-nil means font-lock should hide the emphasis marker characters."
   :group 'org-appearance
   :type 'boolean
   :safe #'booleanp)
 
 (defcustom org-hide-macro-markers nil
-  "Non-nil mean font-lock should hide the brackets marking macro calls."
+  "Non-nil means font-lock should hide the brackets marking macro calls."
   :group 'org-appearance
   :type 'boolean)
 
@@ -3618,7 +3618,7 @@ When nil, the \\name form remains in the buffer."
   :type 'boolean)
 
 (defcustom org-pretty-entities-include-sub-superscripts t
-  "Non-nil means, pretty entity display includes formatting sub/superscripts."
+  "Non-nil means pretty entity display includes formatting sub/superscripts."
   :group 'org-appearance
   :version "24.1"
   :type 'boolean)
@@ -10215,7 +10215,7 @@ nil."
        (replace-match "")
         (if (and (string-match "\\S-" (buffer-substring 
(line-beginning-position) (point)))
                 (equal (char-before) ?\ ))
-           (backward-delete-char 1)
+           (delete-char -1)
          (when (string-match "^[ \t]*$" (buffer-substring
                                           (line-beginning-position) 
(line-end-position)))
             (delete-region (line-beginning-position)
@@ -12006,18 +12006,17 @@ Returns the new tags string, or nil to not change the 
current settings."
                    (setq current nil)
                    (when exit-after-next (setq exit-after-next 'now)))
                   ((= c ?\t)
-                    (condition-case nil
-                        (unless tab-tags
-                          (setq tab-tags
-                                (delq nil
-                                      (mapcar (lambda (x)
-                                                (let ((item (car-safe x)))
-                                                  (and (stringp item)
-                                                       (list item))))
-                                              (org--tag-add-to-alist
-                                               (with-current-buffer buf
-                                                 (org-get-buffer-tags))
-                                               table))))))
+                    (unless tab-tags
+                      (setq tab-tags
+                            (delq nil
+                                  (mapcar (lambda (x)
+                                            (let ((item (car-safe x)))
+                                              (and (stringp item)
+                                                   (list item))))
+                                          (org--tag-add-to-alist
+                                           (with-current-buffer buf
+                                             (org-get-buffer-tags))
+                                           table)))))
                     (setq tg (completing-read "Tag: " tab-tags))
                    (when (string-match "\\S-" tg)
                      (cl-pushnew (list tg) tab-tags :test #'equal)
@@ -16532,7 +16531,7 @@ because, in this case the deletion might narrow the 
column."
             (looking-at-p ".*?|")
             (org-at-table-p))
        (progn (forward-char -1) (org-delete-char 1))
-      (backward-delete-char N)
+      (funcall-interactively #'backward-delete-char N)
       (org-fix-tags-on-the-fly))))
 
 (defun org-delete-char (N)