summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-13 08:27:08 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-13 08:27:08 (GMT)
commite8f5b0ad72da990ed7d409c06dbe0bcadeb226dd (patch)
treed17d0b301f2cb2b32a3e753494d5cadb18e2105a
parent3a5a4ddd4186ccf3832e58f1685e79f7af430ae1 (diff)
downloadorg-mode-e8f5b0ad72da990ed7d409c06dbe0bcadeb226dd.zip
org-mode-e8f5b0ad72da990ed7d409c06dbe0bcadeb226dd.tar.gz
Delete `org-condition-case-unless-debug'release_7.9.3d
* 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.
-rw-r--r--lisp/org-compat.el9
-rw-r--r--lisp/org-odt.el2
2 files changed, 1 insertions, 10 deletions
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 17f2a75..9292b99 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 b5f6e21..92228f3 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)