From 3a5a4ddd4186ccf3832e58f1685e79f7af430ae1 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Sun, 13 Jan 2013 09:24:43 +0100 Subject: [PATCH] Revert "Backwards compatibility: don't defalias special forms" This reverts commit b63275350f524df5e33c2aa915de4415f312f409. --- lisp/org-compat.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 5dba12a94..17f2a75e0 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -447,13 +447,12 @@ With two arguments, return floor and remainder of their quotient." ;; `condition-case-unless-debug' has been introduced in Emacs 24.1 ;; `condition-case-no-debug' has been introduced in Emacs 23.1 -(defmacro org-condition-case-unless-debug (var bodyform &rest handlers) - (declare (debug condition-case) (indent 2)) +(defalias 'org-condition-case-unless-debug (or (and (fboundp 'condition-case-unless-debug) - `(condition-case-unless-debug ,var ,bodyform ,@handlers)) + 'condition-case-unless-debug) (and (fboundp 'condition-case-no-debug) - `(condition-case-no-debug ,var ,bodyform ,@handlers)) - `(condition-case ,var ,bodyform ,@handlers))) + 'condition-case-no-debug) + 'condition-case)) ;; RECURSIVE has been introduced with Emacs 23.2. ;; This is copying and adapted from `tramp-compat-delete-directory' -- 2.11.4.GIT