From 04eb4b08c3d83b6aa4ef1f32ce691ff1c37b543c Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Sun, 13 Jan 2013 09:19:24 +0100 Subject: [PATCH] Revert "Compatibility: Use org-define-obsolete-{function,variable}-alias" This reverts commit 305f29776fba57cdd1566071e0e8a75270d095c6. --- lisp/org-agenda.el | 6 +++--- lisp/org-clock.el | 2 +- lisp/org-compat.el | 18 ------------------ lisp/org-id.el | 2 +- lisp/org-lparse.el | 4 ++-- lisp/org-protocol.el | 6 +++--- lisp/org.el | 13 +++++++++---- 7 files changed, 19 insertions(+), 32 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 05fb797ce..ca8459ca3 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -890,7 +890,7 @@ you want to use two-columns display (see `org-agenda-menu-two-columns')." :version "24.1" :type 'boolean) -(org-define-obsolete-variable-alias 'org-agenda-menu-two-column 'org-agenda-menu-two-columns "24.3") +(define-obsolete-variable-alias 'org-agenda-menu-two-column 'org-agenda-menu-two-columns "24.3") (defcustom org-agenda-menu-two-columns nil "Non-nil means, use two columns to show custom commands in the dispatcher. @@ -900,7 +900,7 @@ to nil." :version "24.1" :type 'boolean) -(org-define-obsolete-variable-alias 'org-finalize-agenda-hook 'org-agenda-finalize-hook "24.3") +(define-obsolete-variable-alias 'org-finalize-agenda-hook 'org-agenda-finalize-hook "24.3") (defcustom org-agenda-finalize-hook nil "Hook run just before displaying an agenda buffer. The buffer is still writable when the hook is called. @@ -7784,7 +7784,7 @@ When called with a prefix argument, include all archive files as well." ""))) (force-mode-line-update)) -(org-define-obsolete-function-alias +(define-obsolete-function-alias 'org-agenda-post-command-hook 'org-agenda-update-agenda-type "24.3") (defun org-agenda-update-agenda-type () diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 32cfa9ae9..c043dd19e 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -205,7 +205,7 @@ file name play this sound file. If not possible, fall back to beep" (const :tag "Standard beep" t) (file :tag "Play sound file"))) -(org-define-obsolete-variable-alias 'org-clock-modeline-total +(define-obsolete-variable-alias 'org-clock-modeline-total 'org-clock-mode-line-total "24.3") (defcustom org-clock-mode-line-total 'auto diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 687b81fd8..5dba12a94 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -169,24 +169,6 @@ If DELETE is non-nil, delete all those overlays." (set-buffer-modified-p modified-p)) (decompose-region beg end))) -(defmacro org-define-obsolete-function-alias (o-name c-name when &optional doc) - "Reconcile the two-argument form of -`define-obsolete-function-alias' in XEmacs/Emacs 22 with the 3-4 -argument form in Emacs 23 and later." - (if (or (featurep 'xemacs) - (< emacs-major-version 23)) - `(define-obsolete-function-alias ,o-name ,c-name) - `(define-obsolete-function-alias ,o-name ,c-name ,when ,doc))) - -(defmacro org-define-obsolete-variable-alias (o-name c-name when &optional doc) - "Reconcile the two-argument form of -`define-obsolete-variable-alias' in XEmacs/Emacs 22 with the 3-4 -argument form in Emacs 23 and later." - (if (or (featurep 'xemacs) - (< emacs-major-version 23)) - `(define-obsolete-variable-alias ,o-name ,c-name) - `(define-obsolete-variable-alias ,o-name ,c-name ,when ,doc))) - ;; Miscellaneous functions (defun org-add-hook (hook function &optional append local) diff --git a/lisp/org-id.el b/lisp/org-id.el index 5d8e5b0dc..6e865b50c 100644 --- a/lisp/org-id.el +++ b/lisp/org-id.el @@ -83,7 +83,7 @@ :tag "Org ID" :group 'org) -(org-define-obsolete-variable-alias +(define-obsolete-variable-alias 'org-link-to-org-use-id 'org-id-link-to-org-use-id "24.3") (defcustom org-id-link-to-org-use-id nil "Non-nil means storing a link to an Org file will use entry IDs. diff --git a/lisp/org-lparse.el b/lisp/org-lparse.el index e9fbbea58..11711353f 100644 --- a/lisp/org-lparse.el +++ b/lisp/org-lparse.el @@ -1718,7 +1718,7 @@ information." (org-lparse-end-paragraph) (org-lparse-end-list-item (or type "u"))) -(org-define-obsolete-function-alias +(define-obsolete-function-alias 'org-lparse-preprocess-after-blockquote-hook 'org-lparse-preprocess-after-blockquote "24.3") @@ -1736,7 +1736,7 @@ information." (format "ORG-%s-END %s" (upcase (match-string 2)) (match-string 3))) t t)))) -(org-define-obsolete-function-alias +(define-obsolete-function-alias 'org-lparse-strip-experimental-blocks-maybe-hook 'org-lparse-strip-experimental-blocks-maybe "24.3") diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el index fd84e62c0..18c6d6d70 100644 --- a/lisp/org-protocol.el +++ b/lisp/org-protocol.el @@ -128,15 +128,15 @@ (filename &optional up)) (declare-function server-edit "server" (&optional arg)) -(org-define-obsolete-function-alias +(define-obsolete-function-alias 'org-protocol-unhex-compound 'org-link-unescape-compound "2011-02-17") -(org-define-obsolete-function-alias +(define-obsolete-function-alias 'org-protocol-unhex-string 'org-link-unescape "2011-02-17") -(org-define-obsolete-function-alias +(define-obsolete-function-alias 'org-protocol-unhex-single-byte-sequence 'org-link-unescape-single-byte-sequence "2011-02-17") diff --git a/lisp/org.el b/lisp/org.el index 83a1e30e2..9409feca1 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -7402,7 +7402,12 @@ even level numbers will become the next higher odd number." ((< change 0) (max 1 (1+ (* 2 (/ (+ level (* 2 change)) 2)))))) (max 1 (+ level (or change 0))))) -(org-define-obsolete-function-alias 'org-get-legal-level 'org-get-valid-level "23.1") +(if (boundp 'define-obsolete-function-alias) + (if (or (featurep 'xemacs) (< emacs-major-version 23)) + (define-obsolete-function-alias 'org-get-legal-level + 'org-get-valid-level) + (define-obsolete-function-alias 'org-get-legal-level + 'org-get-valid-level "23.1"))) (defvar org-called-with-limited-levels nil) ;; Dynamically bound in ;; ̀org-with-limited-levels' @@ -17803,7 +17808,7 @@ BEG and END default to the buffer boundaries." (list 'org-display-inline-remove-overlay)) (push ov org-inline-image-overlays))))))))) -(org-define-obsolete-function-alias +(define-obsolete-function-alias 'org-display-inline-modification-hook 'org-display-inline-remove-overlay "24.3") (defun org-display-inline-remove-overlay (ov after beg end &optional len) @@ -18183,7 +18188,7 @@ If not, return to the original position and throw an error." (defvar org-table-auto-blank-field) ; defined in org-table.el (defvar org-speed-command nil) -(org-define-obsolete-function-alias +(define-obsolete-function-alias 'org-speed-command-default-hook 'org-speed-command-activate "24.3") (defun org-speed-command-activate (keys) @@ -18196,7 +18201,7 @@ Use `org-speed-commands-user' for further customization." (cdr (assoc keys (append org-speed-commands-user org-speed-commands-default))))) -(org-define-obsolete-function-alias +(define-obsolete-function-alias 'org-babel-speed-command-hook 'org-babel-speed-command-activate "24.3") (defun org-babel-speed-command-activate (keys)