procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get rid of json-decode-char0 as well

Browse source 
Fixes: debbugs:20154

* lisp/json.el (json-decode-char0): Delete this alias as well.
(json-read-escaped-char): Don't call it.
This commit is contained in:
Dmitry Gutov 2015-03-23 18:00:39 +02:00
parent 24960fc72c
commit a50c95dbd2
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -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'.

8
lisp/json.el
View file

@ -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)))))))