ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-12-24 14:01:51 +01:00
parent 4549f0c99c 1b4e396b6b
commit e6d8ed51b8
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lisp/org-compat.el
View File

@ -256,7 +256,6 @@ Works on both Emacs and XEmacs."
(when (boundp 'zmacs-regions) (when (boundp 'zmacs-regions)
(setq zmacs-regions t))))) (setq zmacs-regions t)))))
;; Invisibility compatibility ;; Invisibility compatibility
(defun org-remove-from-invisibility-spec (arg) (defun org-remove-from-invisibility-spec (arg)
@ -448,12 +447,34 @@ With two arguments, return floor and remainder of their quotient."
;; `condition-case-unless-debug' has been introduced in Emacs 24.1 ;; `condition-case-unless-debug' has been introduced in Emacs 24.1
;; `condition-case-no-debug' has been introduced in Emacs 23.1 ;; `condition-case-no-debug' has been introduced in Emacs 23.1
(defalias 'org-condition-case-unless-debug (defmacro org-condition-case-unless-debug (var bodyform &rest handlers)
(declare (debug condition-case) (indent 2))
(or (and (fboundp 'condition-case-unless-debug) (or (and (fboundp 'condition-case-unless-debug)
'condition-case-unless-debug) `(condition-case-unless-debug ,var ,bodyform ,@handlers))
(and (fboundp 'condition-case-no-debug) (and (fboundp 'condition-case-no-debug)
'condition-case-no-debug) `(condition-case-no-debug ,var ,bodyform ,@handlers))
'condition-case)) `(condition-case ,var ,bodyform ,@handlers)))
;; 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)
"Compatibility function for `delete-directory'."
(if (null recursive)
(delete-directory directory)
(condition-case nil
(funcall 'delete-directory directory recursive)
;; This Emacs version does not support the RECURSIVE flag. We
;; use the implementation from Emacs 23.2.
(wrong-number-of-arguments
(setq directory (directory-file-name (expand-file-name directory)))
(if (not (file-symlink-p directory))
(mapc (lambda (file)
(if (eq t (car (file-attributes file)))
(org-delete-directory file recursive)
(delete-file file)))
(directory-files
directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")))
(delete-directory directory)))))
;;;###autoload ;;;###autoload
(defmacro org-check-version () (defmacro org-check-version ()

2
lisp/org-odt.el
View File

@ -446,7 +446,7 @@ values. See Info node `(emacs) File Variables'."
(kill-buffer))) (kill-buffer)))
xml-files)) xml-files))
;; delete temporary directory. ;; delete temporary directory.
(delete-directory org-odt-zip-dir t))))) (org-delete-directory org-odt-zip-dir t)))))
(org-condition-case-unless-debug err (org-condition-case-unless-debug err
(prog1 (progn ,@body) (prog1 (progn ,@body)
(funcall --cleanup-xml-buffers)) (funcall --cleanup-xml-buffers))