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.
This commit is contained in:
parent
3a5a4ddd41
commit
e8f5b0ad72
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue