summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-13 10:17:56 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-13 10:17:56 (GMT)
commit7369cada30110d602f248c780aab55956ad9f1ae (patch)
tree6361912487ff39e89dcb43fdc2ba0cce192c0a9c
parent409ee8a2f27e3fe35b5bf6da6ded22c3da00e1d3 (diff)
parente8f5b0ad72da990ed7d409c06dbe0bcadeb226dd (diff)
downloadorg-mode-7369cada30110d602f248c780aab55956ad9f1ae.zip
org-mode-7369cada30110d602f248c780aab55956ad9f1ae.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-agenda.el6
-rw-r--r--lisp/org-clock.el2
-rw-r--r--lisp/org-compat.el28
-rw-r--r--lisp/org-id.el2
-rw-r--r--lisp/org-lparse.el4
-rw-r--r--lisp/org-odt.el2
-rw-r--r--lisp/org-protocol.el6
-rw-r--r--lisp/org.el13
8 files changed, 20 insertions, 43 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 27abc58..642f173 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)
-(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.
@@ -916,7 +916,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.
@@ -7880,7 +7880,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 c4cca8b..914f5ff 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -222,7 +222,7 @@ file name Play this sound file, 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 2d200b7..9986958 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -174,24 +174,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)
@@ -468,16 +450,6 @@ With two arguments, return floor and remainder of their quotient."
'pop-to-buffer-same-window buffer-or-name norecord)
(funcall 'switch-to-buffer buffer-or-name norecord)))
-;; `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))
- (or (and (fboundp 'condition-case-unless-debug)
- `(condition-case-unless-debug ,var ,bodyform ,@handlers))
- (and (fboundp 'condition-case-no-debug)
- `(condition-case-no-debug ,var ,bodyform ,@handlers))
- `(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)
diff --git a/lisp/org-id.el b/lisp/org-id.el
index b35ea5e..39ca170 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 e9fbbea..1171135 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-odt.el b/lisp/org-odt.el
index 0ec0f06..eba8139 100644
--- a/lisp/org-odt.el
+++ b/lisp/org-odt.el
@@ -448,7 +448,7 @@ values. See Info node `(emacs) File Variables'."
xml-files))
;; delete temporary directory.
(org-delete-directory org-odt-zip-dir t)))))
- (org-condition-case-unless-debug err
+ (condition-case err
(prog1 (progn ,@body)
(funcall --cleanup-xml-buffers))
((quit error)
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index fd84e62..18c6d6d 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 1c2ee9a..83954e4 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7589,7 +7589,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'
@@ -18248,7 +18253,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)
@@ -18630,7 +18635,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)
@@ -18643,7 +18648,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)