From a50c95dbd24eb0e56ad0eb0f8ff2c013b5f92285 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Mon, 23 Mar 2015 18:00:39 +0200 Subject: [PATCH] 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. --- lisp/ChangeLog | 7 ++++++- lisp/json.el | 8 +------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 630265a0f4..9448e0514e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-23 Dmitry Gutov + + * 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 * emacs-lisp/lisp-mode.el (lisp--el-non-funcall-position-p): New function. @@ -33,7 +38,7 @@ 2015-03-22 Dmitry Gutov - * 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 fb0f62c877..a1e9bb78d1 100644 --- 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))))))) -- 2.39.2