Get rid of json-decode-char0 as well

Fixes: debbugs:20154
* lisp/json.el (json-decode-char0): Delete this alias as well.
(json-read-escaped-char): Don't call it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 630265a0f4c9cb4bc31a42a0437dd0a73e72ba59..9448e0514e60ff1c9c20ea29881836157cc46269 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-23  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * json.el (json-decode-char0): Delete this alias as well.
+       (json-read-escaped-char): Don't call it (bug#20154).
+
 2015-03-23  Daniel Colascione  <dancol@dancol.org>
 
        * emacs-lisp/lisp-mode.el (lisp--el-non-funcall-position-p): New function.
@@ -33,7 +38,7 @@
 
 2015-03-22  Dmitry Gutov  <dgutov@yandex.ru>
 
-       * json.el (json-decode-char0): Delete this alias.
+       * json.el (json-encode-char0): Delete this alias.
        (json-encode-string): Rewrite to improve performance (bug#20154).
        (json-encode-char): Fold into `json-encode-string'.
 

diff --git a/lisp/json.el b/lisp/json.el
index fb0f62c877794747d158bf378f7af3fabe87e9c2..a1e9bb78d117a67aa8060f8cccbc83eeb96cf2ec 100644 (file)
--- a/lisp/json.el
+++ b/lisp/json.el
@@ -52,12 +52,6 @@
 
 ;;; Code:
 
-
-;; Compatibility code
-
-(defalias 'json-decode-char0 'decode-char)
-
-
 ;; Parameters
 
 (defvar json-object-type 'alist
@@ -286,7 +280,7 @@ representation will be parsed correctly."
      ((looking-at "[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f]")
       (let ((hex (match-string 0)))
         (json-advance 4)
-        (json-decode-char0 'ucs (string-to-number hex 16))))
+        (string-to-number hex 16)))
      (t
       (signal 'json-string-escape (list (point)))))))