Update to Org 9.5.2-24-g668205

diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el
index 945ea52980c4d4c5c3b15233e450cbd3b7d61d7f..bfead3aa5af7913e00c113087850d034e4d11258 100644 (file)
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -1453,7 +1453,8 @@ Of course, if exact position has been required, just put it there."
       (org-with-point-at pos
        (when org-capture-bookmark
          (let ((bookmark (plist-get org-bookmark-names-plist :last-capture)))
-           (when bookmark (with-demoted-errors (bookmark-set bookmark)))))
+           (when bookmark (with-demoted-errors "Bookmark set error: %S"
+                            (bookmark-set bookmark)))))
        (move-marker org-capture-last-stored-marker (point))))))
 
 (defun org-capture-narrow (beg end)

diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index 79527866076dc585a5e34d4f8bca2499466878a9..9db1406b3fbb328d9278d7f3c5469e46292f7a5e 100644 (file)
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -396,31 +396,25 @@ still has an entry since one of its properties (`:title') does.")
   "Alist between element types and locations of secondary values.")
 
 (defconst org-element--pair-round-table
-  (let ((table (make-syntax-table)))
+  (let ((table (make-char-table 'syntax-table '(2))))
     (modify-syntax-entry ?\( "()" table)
     (modify-syntax-entry ?\) ")(" table)
-    (dolist (char '(?\{ ?\} ?\[ ?\] ?\< ?\>) table)
-      (modify-syntax-entry char " " table)))
-  "Table used internally to pair only round brackets.
-Other brackets are treated as spaces.")
+    table)
+  "Table used internally to pair only round brackets.")
 
 (defconst org-element--pair-square-table
-  (let ((table (make-syntax-table)))
+  (let ((table (make-char-table 'syntax-table '(2))))
     (modify-syntax-entry ?\[ "(]" table)
     (modify-syntax-entry ?\] ")[" table)
-    (dolist (char '(?\{ ?\} ?\( ?\) ?\< ?\>) table)
-      (modify-syntax-entry char " " table)))
-  "Table used internally to pair only square brackets.
-Other brackets are treated as spaces.")
+    table)
+  "Table used internally to pair only square brackets.")
 
 (defconst org-element--pair-curly-table
-  (let ((table (make-syntax-table)))
+  (let ((table (make-char-table 'syntax-table '(2))))
     (modify-syntax-entry ?\{ "(}" table)
     (modify-syntax-entry ?\} "){" table)
-    (dolist (char '(?\[ ?\] ?\( ?\) ?\< ?\>) table)
-      (modify-syntax-entry char " " table)))
-  "Table used internally to pair only curly brackets.
-Other brackets are treated as spaces.")
+    table)
+  "Table used internally to pair only curly brackets.")
 
 (defun org-element--parse-paired-brackets (char)
   "Parse paired brackets at point.

diff --git a/lisp/org/org-refile.el b/lisp/org/org-refile.el
index 5dfffe785199fc9477c92c616fceab8e74c0f7e6..5ad73422efa6f6bec9c74bf2efaeb5cacc974945 100644 (file)
--- a/lisp/org/org-refile.el
+++ b/lisp/org/org-refile.el
@@ -566,16 +566,16 @@ prefix argument (`C-u C-u C-u C-c C-w')."
               (let ((bookmark-name (plist-get org-bookmark-names-plist
                                               :last-refile)))
                 (when bookmark-name
-                  (with-demoted-errors
-                      (bookmark-set bookmark-name))))
+                  (with-demoted-errors "Bookmark set error: %S"
+                    (bookmark-set bookmark-name))))
               ;; If we are refiling for capture, make sure that the
               ;; last-capture pointers point here
               (when (bound-and-true-p org-capture-is-refiling)
                 (let ((bookmark-name (plist-get org-bookmark-names-plist
                                                 :last-capture-marker)))
                   (when bookmark-name
-                    (with-demoted-errors
-                        (bookmark-set bookmark-name))))
+                    (with-demoted-errors "Bookmark set error: %S"
+                      (bookmark-set bookmark-name))))
                 (move-marker org-capture-last-stored-marker (point)))
               (when (fboundp 'deactivate-mark) (deactivate-mark))
               (run-hooks 'org-after-refile-insert-hook)))

diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index badf0e4769527d19086af58df0fad858f03a5b41..a38b79304ef3a24b0f76190dac34452563dc8cd3 100644 (file)
--- 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-22-g33543d"))
+   (let ((org-git-version "release_9.5.2-24-g668205"))
      org-git-version))
 \f
 (provide 'org-version)