From: Bastien Guerry <bzg@altern.org>
Date: Sun, 13 Jan 2013 08:27:08 +0000 (+0100)
Subject: Delete `org-condition-case-unless-debug'
X-Git-Tag: release_7.9.3d^0
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/e8f5b0ad72da990ed7d409c06dbe0bcadeb226dd

Delete `org-condition-case-unless-debug'

* org-compat.el (org-condition-case-unless-debug): Delete.

* org-odt.el (org-odt-cleanup-xml-buffers): Use
`condition-case' instead of `org-condition-case-unless-debug',
which is now deleted.
---

diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 17f2a75e0..9292b9943 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -445,15 +445,6 @@ 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
-;; `condition-case-no-debug' has been introduced in Emacs 23.1
-(defalias 'org-condition-case-unless-debug
-  (or (and (fboundp 'condition-case-unless-debug)
-	   'condition-case-unless-debug)
-      (and (fboundp 'condition-case-no-debug)
-	   'condition-case-no-debug)
-      'condition-case))
-
 ;; RECURSIVE has been introduced with Emacs 23.2.
 ;; This is copying and adapted from `tramp-compat-delete-directory'
 (defun org-delete-directory (directory &optional recursive)
diff --git a/lisp/org-odt.el b/lisp/org-odt.el
index b5f6e21c0..92228f37e 100644
--- a/lisp/org-odt.el
+++ b/lisp/org-odt.el
@@ -447,7 +447,7 @@ values.  See Info node `(emacs) File Variables'."
 		     xml-files))
 	     ;; delete temporary directory.
 	     (org-delete-directory org-odt-zip-dir t)))))
-     (org-condition-case-unless-debug err
+     (condition-case err
 	 (prog1 (progn ,@body)
 	   (funcall --cleanup-xml-buffers))
        ((quit error)