mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-29 07:58:21 +00:00
Code

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

Browse Source 
* 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'.
This commit is contained in:
Bastien Guerry 2012-07-12 10:30:33 +02:00
parent 9b264cf3a0
commit 1fe42fd0bc
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/org-compat.el
View File

@ -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

2
lisp/org-odt.el
View File

@ -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)