diff --git a/contrib/lisp/org-e-odt.el b/contrib/lisp/org-e-odt.el index 373af4a15..ded4b0286 100644 --- a/contrib/lisp/org-e-odt.el +++ b/contrib/lisp/org-e-odt.el @@ -3103,7 +3103,7 @@ and prefix with \"OrgSrc\". For example, (lambda (style text-block text-id text-begins-block-p) (insert (format "" style)))) (hfy-end-span-handler (lambda nil (insert "")))) - (with-no-warnings (htmlfontify-string line)))) + (org-no-warnings (htmlfontify-string line)))) (defun org-e-odt-do-format-code (code &optional lang refs retain-labels num-start) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index ed3886913..ba8d04142 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -906,7 +906,7 @@ you want to use two-columns display (see `org-agenda-menu-two-columns')." :version "24.1" :type 'boolean) -(define-obsolete-variable-alias 'org-agenda-menu-two-column 'org-agenda-menu-two-columns "24.3") +(org-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. @@ -916,7 +916,7 @@ to nil." :version "24.1" :type 'boolean) -(define-obsolete-variable-alias 'org-finalize-agenda-hook 'org-agenda-finalize-hook "24.3") +(org-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. @@ -7775,7 +7775,7 @@ When called with a prefix argument, include all archive files as well." ""))) (force-mode-line-update)) -(define-obsolete-function-alias +(org-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 83ff459a9..4af05f598 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -221,7 +221,7 @@ file name Play this sound file, fall back to beep" (const :tag "Standard beep" t) (file :tag "Play sound file"))) -(define-obsolete-variable-alias 'org-clock-modeline-total +(org-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 8f21321cb..815087534 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -169,6 +169,24 @@ 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-faces.el b/lisp/org-faces.el index 80e81349f..606db0814 100644 --- a/lisp/org-faces.el +++ b/lisp/org-faces.el @@ -44,6 +44,9 @@ (set-face-doc-string new-face docstring))))) (put 'org-copy-face 'lisp-indent-function 2) +(when (featurep 'xemacs) + (put 'mode-line 'face-alias 'modeline)) + (defgroup org-faces nil "Faces in Org-mode." :tag "Org Faces" diff --git a/lisp/org-id.el b/lisp/org-id.el index 6e865b50c..5d8e5b0dc 100644 --- a/lisp/org-id.el +++ b/lisp/org-id.el @@ -83,7 +83,7 @@ :tag "Org ID" :group 'org) -(define-obsolete-variable-alias +(org-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 11711353f..e9fbbea58 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"))) -(define-obsolete-function-alias +(org-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)))) -(define-obsolete-function-alias +(org-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 9eaf6420b..092596490 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)) -(define-obsolete-function-alias +(org-define-obsolete-function-alias 'org-protocol-unhex-compound 'org-link-unescape-compound "2011-02-17") -(define-obsolete-function-alias +(org-define-obsolete-function-alias 'org-protocol-unhex-string 'org-link-unescape "2011-02-17") -(define-obsolete-function-alias +(org-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 87550148c..4ced7e2b6 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -7572,12 +7572,7 @@ 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))))) -(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"))) +(org-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' @@ -18204,7 +18199,7 @@ BEG and END default to the buffer boundaries." (list 'org-display-inline-remove-overlay)) (push ov org-inline-image-overlays))))))))) -(define-obsolete-function-alias +(org-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) @@ -18586,7 +18581,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) -(define-obsolete-function-alias +(org-define-obsolete-function-alias 'org-speed-command-default-hook 'org-speed-command-activate "24.3") (defun org-speed-command-activate (keys) @@ -18599,7 +18594,7 @@ Use `org-speed-commands-user' for further customization." (cdr (assoc keys (append org-speed-commands-user org-speed-commands-default))))) -(define-obsolete-function-alias +(org-define-obsolete-function-alias 'org-babel-speed-command-hook 'org-babel-speed-command-activate "24.3") (defun org-babel-speed-command-activate (keys)