From bdc95549dd52e3ddeace3f85eef8b8cd6c7bf307 Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Wed, 19 Dec 2012 15:30:23 +0100 Subject: [PATCH 1/2] Backwards compatibility: use compatibility macro * lisp/org-agenda.el (org-agenda-write): Use org-called-interactively-p instead of called-interactively-p. --- lisp/org-agenda.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 90995f79e..cb7822d4f 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -3194,7 +3194,7 @@ If AGENDA-BUFFER-NAME, use this as the buffer name for the agenda to write." (kill-buffer (current-buffer)) (message "Plain text written to %s" file)))))))) (set-buffer (or agenda-bufname - (and (called-interactively-p 'any) (buffer-name)) + (and (org-called-interactively-p 'any) (buffer-name)) org-agenda-buffer-name))) (when open (org-open-file file))) From b9ea74a19506329778939b9141590fa000b9abce Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Mon, 17 Dec 2012 19:08:12 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Backwards=20compatibility=20for=20`user-err?= =?UTF-8?q?or=C2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lisp/org-compat.el (user-error): Defalias to `error´ for Emacsen that don't have it. --- lisp/org-compat.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 6e582b8c1..7172452c9 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -169,6 +169,11 @@ If DELETE is non-nil, delete all those overlays." (set-buffer-modified-p modified-p)) (decompose-region beg end))) +(eval-when-compile + ; user-error is only available from 24.2.50 on + (unless (fboundp 'user-error) + (defalias 'user-error 'error))) + ;; Miscellaneous functions (defun org-add-hook (hook function &optional append local)