branch: externals/org
commit 5b4eebfabdc6a9b4ed223025161a342cb312c1d0
Author: Ihor Radchenko <yanta...@posteo.net>
Commit: Ihor Radchenko <yanta...@posteo.net>
Prefer `condition-case-unless-debug' where possible
* lisp/org-clock.el (org-clock-play-sound):
* lisp/org-element.el (org-element-at-point):
* lisp/org-src.el (org-src--edit-element):
(org-fontify-inline-src-blocks):
* lisp/org.el (ox):
(org-fontify-meta-lines-and-blocks):
(org-map-dblocks):
* lisp/ox-odt.el (org-odt--export-wrap): Use
`condition-case-unless-debug' to allow more descriptive backtraces
when `debug-on-error' is non-nil.
Link: https://orgmode.org/list/878rdnq1iy....@web.de
---
lisp/org-clock.el | 2 +-
lisp/org-element.el | 22 +++++++++++-----------
lisp/org-src.el | 4 ++--
lisp/org.el | 8 ++++----
lisp/ox-odt.el | 2 +-
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index c9f97c5fc4..9a30b478ed 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -902,7 +902,7 @@ If CLOCK-SOUND is non-nil, it overrides `org-clock-sound'."
(if (executable-find "aplay")
(start-process "org-clock-play-notification" nil
"aplay" file)
- (condition-case nil
+ (condition-case-unless-debug nil
(play-sound-file file)
(error (beep t) (beep t))))))))))
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 3c1c9c89c4..51032c81b6 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -7833,7 +7833,7 @@ element ending there."
(org-element--request-beg
(car
org-element--cache-sync-requests)))))
(org-element--cache-find pom))
- (condition-case err
+ (condition-case-unless-debug err
(org-element--parse-to pom)
(error
(org-element--cache-warn
@@ -7853,16 +7853,16 @@ element ending there."
(unless (eq 'org-data (org-element-type element))
(unless (and cached-only
(not (and element
- (or (= pom (org-element-property :begin element))
- (and (not (memq (org-element-type element)
org-element-greater-elements))
- (>= pom (org-element-property :begin
element))
- (< pom (org-element-property :end
element)))
- (and (org-element-property :contents-begin
element)
- (>= pom (org-element-property :begin
element))
- (< pom (org-element-property
:contents-begin element)))
- (and (not (org-element-property :contents-end
element))
- (>= pom (org-element-property :begin
element))
- (< pom (org-element-property :end
element)))))))
+ (or (= pom (org-element-property :begin element))
+ (and (not (memq (org-element-type element)
org-element-greater-elements))
+ (>= pom (org-element-property :begin
element))
+ (< pom (org-element-property :end
element)))
+ (and (org-element-property :contents-begin
element)
+ (>= pom (org-element-property :begin
element))
+ (< pom (org-element-property
:contents-begin element)))
+ (and (not (org-element-property :contents-end
element))
+ (>= pom (org-element-property :begin
element))
+ (< pom (org-element-property :end
element)))))))
(if (not (eq (org-element-type element) 'section))
element
(org-element-at-point (1+ pom) cached-only))))))
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 6daa9fd217..f15ba8e998 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -584,7 +584,7 @@ Leave point in edit buffer."
;; Initialize buffer.
(when (functionp initialize)
(let ((org-inhibit-startup t))
- (condition-case e
+ (condition-case-unless-debug e
(funcall initialize)
(error (message "Initialization fails with: %S"
(error-message-string e))))))
@@ -717,7 +717,7 @@ as `org-src-fontify-natively' is non-nil."
(defun org-fontify-inline-src-blocks (limit)
"Try to apply `org-fontify-inline-src-blocks-1'."
- (condition-case nil
+ (condition-case-unless-debug nil
(org-fontify-inline-src-blocks-1 limit)
(error (message "Org mode fontification error in %S at %d"
(current-buffer)
diff --git a/lisp/org.el b/lisp/org.el
index 74972722d1..0e5740412b 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -716,7 +716,7 @@ defined in org-duration.el.")
"Load all extensions listed in `org-modules'."
(when (or force (not org-modules-loaded))
(dolist (ext org-modules)
- (condition-case nil (require ext)
+ (condition-case-unless-debug nil (require ext)
(error (message "Problems while trying to load feature `%s'" ext))))
(setq org-modules-loaded t)))
@@ -905,7 +905,7 @@ depends on, if any."
(eval-after-load 'ox
'(dolist (backend org-export-backends)
- (condition-case nil (require (intern (format "ox-%s" backend)))
+ (condition-case-unless-debug nil (require (intern (format "ox-%s"
backend)))
(error (message "Problems while trying to load export backend `%s'"
backend)))))
@@ -5375,7 +5375,7 @@ by a #."
:group 'org-appearance)
(defun org-fontify-meta-lines-and-blocks (limit)
- (condition-case nil
+ (condition-case-unless-debug nil
(org-fontify-meta-lines-and-blocks-1 limit)
(error (message "Org mode fontification error in %S at %d"
(current-buffer)
@@ -8772,7 +8772,7 @@ If COMMAND is not given, use `org-update-dblock'."
(while (re-search-forward org-dblock-start-re nil t)
(goto-char (match-beginning 0))
(save-excursion
- (condition-case nil
+ (condition-case-unless-debug nil
(funcall cmd)
(error (message "Error during update of dynamic block"))))
(unless (re-search-forward org-dblock-end-re nil t)
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index b0266079ad..da2d4c0e8c 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -4016,7 +4016,7 @@ contextual information."
;; Delete temporary directory and also other embedded
;; files that get copied there.
(delete-directory org-odt-zip-dir t))))
- (condition-case err
+ (condition-case-unless-debug err
(progn
(unless (executable-find "zip")
;; Not at all OSes ship with zip by default
