New alias `org-condition-case-unless-debug'.

* org-odt.el (org-odt-cleanup-xml-buffers): Use the new alias.

* org-compat.el: Alias `org-condition-case-unless-debug' to
`condition-case-unless-debug' or `condition-case-no-debug'.

2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 0cdb6af..09a36a2 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -428,7 +428,7 @@ With two arguments, return floor and remainder of their quotient."
   (let ((q (floor x y)))
     (list q (- x (if y (* y q) q)))))
 
-;; `pop-to-buffer-same-window' has been introduced with Emacs 24.1.
+;; `pop-to-buffer-same-window' has been introduced in Emacs 24.1.
 (defun org-pop-to-buffer-same-window
   (&optional buffer-or-name norecord label)
   "Pop to buffer specified by BUFFER-OR-NAME in the selected window."
@@ -437,6 +437,12 @@ With two arguments, return floor and remainder of their quotient."
        'pop-to-buffer-same-window buffer-or-name norecord)
     (funcall 'switch-to-buffer buffer-or-name norecord)))
 
+;; `condition-case-unless-debug' has been introduced in Emacs 24.1
+(defalias 'org-condition-case-unless-debug
+  (if (fboundp 'condition-case-unless-debug)
+      'condition-case-unless-debug
+    'condition-case-no-debug))
+
 (provide 'org-compat)
 
 ;;; org-compat.el ends here
diff --git a/lisp/org-odt.el b/lisp/org-odt.el
index 5fc1648..e24c8a5 100644
--- a/lisp/org-odt.el
+++ b/lisp/org-odt.el
@@ -445,7 +445,7 @@ variable, the list of valid values are populated based on
 		     xml-files))
 	     ;; delete temporary directory.
 	     (delete-directory org-odt-zip-dir t)))))
-     (condition-case-no-debug err
+     (org-condition-case-unless-debug err
 	 (prog1 (progn ,@body)
 	   (funcall --cleanup-xml-buffers))
        ((quit error)