aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-09-27 18:55:03 -0400
committerStefan Monnier2012-09-27 18:55:03 -0400
commite28e67b3a36f1534e2659fbfde90846a9fd5df6c (patch)
treec5af12042373877fc675d7c775dfef3a731ac8d7
parent9cad61d6db2b2a89f99eddcb88f09a209e59cc8c (diff)
downloademacs-e28e67b3a36f1534e2659fbfde90846a9fd5df6c.tar.gz
emacs-e28e67b3a36f1534e2659fbfde90846a9fd5df6c.zip
* lisp/json.el (json-encode-char): Codes 127 isn't "ASCII printable" either.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/json.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 079a3feaea1..1c9c7c3c449 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,6 @@
12012-09-27 Stefan Monnier <monnier@iro.umontreal.ca> 12012-09-27 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * json.el (json-encode-char): Codes 128-160 aren't "ASCII printable". 3 * json.el (json-encode-char): Codes 127-160 aren't "ASCII printable".
4 4
52012-09-27 Glenn Morris <rgm@gnu.org> 52012-09-27 Glenn Morris <rgm@gnu.org>
6 6
diff --git a/lisp/json.el b/lisp/json.el
index 1a70d0b40ce..8167bfe93f2 100644
--- a/lisp/json.el
+++ b/lisp/json.el
@@ -315,7 +315,7 @@ representation will be parsed correctly."
315 (control-char 315 (control-char
316 (format "\\%c" control-char)) 316 (format "\\%c" control-char))
317 ;; ASCIIish printable character. 317 ;; ASCIIish printable character.
318 ((and (> char 31) (< char 128)) 318 ((and (> char 31) (< char 127))
319 (format "%c" char)) 319 (format "%c" char))
320 ;; Fallback: UCS code point in \uNNNN form. 320 ;; Fallback: UCS code point in \uNNNN form.
321 (t 321 (t