diff options
| author | Bastien Guerry | 2013-01-13 11:33:16 +0100 |
|---|---|---|
| committer | Bastien Guerry | 2013-01-13 11:33:16 +0100 |
| commit | a89c8ef024113dbf993db0d379fabbfb06c86520 (patch) | |
| tree | 94b70d44c096cec75cf0dd10686042ef4574928c /lisp/org/org-protocol.el | |
| parent | f5e9cbd447d2af41da420a5dde2f28ba75892a37 (diff) | |
| download | emacs-a89c8ef024113dbf993db0d379fabbfb06c86520.tar.gz emacs-a89c8ef024113dbf993db0d379fabbfb06c86520.zip | |
Merge Org 7.9.3d (commit e8f5b0ad).
Diffstat (limited to 'lisp/org/org-protocol.el')
| -rw-r--r-- | lisp/org/org-protocol.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el index fd84e62c003..18c6d6d70a4 100644 --- a/lisp/org/org-protocol.el +++ b/lisp/org/org-protocol.el | |||
| @@ -128,15 +128,15 @@ | |||
| 128 | (filename &optional up)) | 128 | (filename &optional up)) |
| 129 | (declare-function server-edit "server" (&optional arg)) | 129 | (declare-function server-edit "server" (&optional arg)) |
| 130 | 130 | ||
| 131 | (org-define-obsolete-function-alias | 131 | (define-obsolete-function-alias |
| 132 | 'org-protocol-unhex-compound 'org-link-unescape-compound | 132 | 'org-protocol-unhex-compound 'org-link-unescape-compound |
| 133 | "2011-02-17") | 133 | "2011-02-17") |
| 134 | 134 | ||
| 135 | (org-define-obsolete-function-alias | 135 | (define-obsolete-function-alias |
| 136 | 'org-protocol-unhex-string 'org-link-unescape | 136 | 'org-protocol-unhex-string 'org-link-unescape |
| 137 | "2011-02-17") | 137 | "2011-02-17") |
| 138 | 138 | ||
| 139 | (org-define-obsolete-function-alias | 139 | (define-obsolete-function-alias |
| 140 | 'org-protocol-unhex-single-byte-sequence | 140 | 'org-protocol-unhex-single-byte-sequence |
| 141 | 'org-link-unescape-single-byte-sequence | 141 | 'org-link-unescape-single-byte-sequence |
| 142 | "2011-02-17") | 142 | "2011-02-17") |