diff options
| author | Mark Oteiza | 2017-09-15 10:06:56 -0400 |
|---|---|---|
| committer | Mark Oteiza | 2017-09-15 10:06:56 -0400 |
| commit | 1c700547505dd7f2bf3800830e6b113f7248f528 (patch) | |
| tree | bba90d2b60d7263bb23ebaf67d726427995503f5 | |
| parent | 3b783a75ad6b609d4e0f60c2d31d4fe91dd08c62 (diff) | |
| download | emacs-1c700547505dd7f2bf3800830e6b113f7248f528.tar.gz emacs-1c700547505dd7f2bf3800830e6b113f7248f528.zip | |
; Partially revert previous commit
The reduction in was because I broke it.
* lisp/json.el (json-pop): Do not bind at compile time something needed
at run time.
| -rw-r--r-- | lisp/json.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/json.el b/lisp/json.el index 1e724b42e75..b13ec781b48 100644 --- a/lisp/json.el +++ b/lisp/json.el | |||
| @@ -197,12 +197,12 @@ Unlike `reverse', this keeps the property-value pairs intact." | |||
| 197 | 197 | ||
| 198 | (define-inline json-pop () | 198 | (define-inline json-pop () |
| 199 | "Advance past the character at point, returning it." | 199 | "Advance past the character at point, returning it." |
| 200 | (inline-letevals ((char (json-peek))) | 200 | (inline-quote |
| 201 | (inline-quote | 201 | (let ((char (json-peek))) |
| 202 | (if (zerop ,char) | 202 | (if (zerop char) |
| 203 | (signal 'json-end-of-file nil) | 203 | (signal 'json-end-of-file nil) |
| 204 | (json-advance) | 204 | (json-advance) |
| 205 | ,char)))) | 205 | char)))) |
| 206 | 206 | ||
| 207 | (define-inline json-skip-whitespace () | 207 | (define-inline json-skip-whitespace () |
| 208 | "Skip past the whitespace at point." | 208 | "Skip past the whitespace at point." |