summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2016-06-23 14:10:34 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2016-06-23 14:10:34 +0200
commit23d84285bf4132cfbfde9d39ebd2d07e5552bb10 (patch)
tree727271c6f01b2f0d403a495f5292ca1da574c8dd
parentb3d2b354c9d65e7ffc5d90763d96cb7d23c57fb1 (diff)
downloadorg-mode-23d84285bf4132cfbfde9d39ebd2d07e5552bb10.tar.gz
Deprecate `org-char-to-string' in favor of `char-to-string'
* lisp/org-macs.el (org-char-to-string): Remove function. * lisp/org-compat.el (org-char-to-string): Declare function as obsolete. * lisp/org.el (org-link-unescape-compound): Apply removal.
-rw-r--r--lisp/org-compat.el1
-rw-r--r--lisp/org-macs.el15
-rw-r--r--lisp/org.el2
3 files changed, 2 insertions, 16 deletions
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 5cf7999..00909f9 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -88,6 +88,7 @@
(define-obsolete-function-alias 'org-floor* 'cl-floor "Org 9.0")
;;;; Functions available since Emacs 24.3
+(define-obsolete-function-alias 'org-char-to-string 'char-to-string "Org 9.0")
(define-obsolete-function-alias 'org-buffer-narrowed-p 'buffer-narrowed-p "Org 9.0")
(define-obsolete-function-alias 'org-delete-directory 'delete-directory "Org 9.0")
(define-obsolete-function-alias 'org-number-sequence 'number-sequence "Org 9.0")
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 4c223f8..75997fc 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -31,21 +31,6 @@
;;; Code:
-(eval-and-compile
- (unless (fboundp 'declare-function)
- (defmacro declare-function (fn file &optional _arglist _fileonly)
- `(autoload ',fn ,file)))
-
- (if (>= emacs-major-version 23)
- (defsubst org-char-to-string(c)
- "Defsubst to decode UTF-8 character values in emacs 23 and beyond."
- (char-to-string c))
- (defsubst org-char-to-string (c)
- "Defsubst to decode UTF-8 character values in emacs 22."
- (string (decode-char 'ucs c)))))
-
-(declare-function org-add-props "org-compat" (string plist &rest props))
-
(defmacro org-with-gensyms (symbols &rest body)
(declare (debug (sexp body)) (indent 1))
`(let ,(mapcar (lambda (s)
diff --git a/lisp/org.el b/lisp/org.el
index e59da06..1f518ac 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10190,7 +10190,7 @@ Note: this function also decodes single byte encodings like
(when (> eat 0) (setq eat (- eat 1)))
(cond
((= 0 eat) ;multi byte
- (setq ret (concat ret (org-char-to-string sum)))
+ (setq ret (concat ret (char-to-string sum)))
(setq sum 0))
((not bytes) ; single byte(s)
(setq ret (org-link-unescape-single-byte-sequence hex))))))