summaryrefslogtreecommitdiff
path: root/lisp/json.el
Commit message (Collapse)AuthorAgeFilesLines
* Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.caPaul Eggert2013-01-021-1/+1
|\
| * Update copyright notices for 2013.Paul Eggert2013-01-011-1/+1
| |
* | Spelling fixes.Paul Eggert2012-12-141-1/+1
| | | | | | | | | | | | My favorite was that the word "dictionary" was misspelled. Also, correct the title in the DeRemer & Pennello 1982 citation, and add a URL.
* | * lisp/json.el: Add pretty-print option.Ryan Crum2012-12-141-25/+111
| | | | | | | | | | | | | | | | | | | | | | | | (json-encoding-separator, json-encoding-default-indentation) (json--encoding-current-indentation, json-encoding-pretty-print) (json-encoding-lisp-style-closings): New vars. (json--with-indentation): New macro. (json-encode-hash-table, json-encode-alist, json-encode-plist) (json-encode-array): Use it to obey json-encoding-pretty-print. (json-pretty-print-buffer, json-pretty-print): New commands. Fixes: debbugs:12634
* | Use cl-lib instead of cl, and interactive-p => called-interactively-p.Stefan Monnier2012-11-191-1/+0
|/ | | | | | | | | | | | | | | | | * lisp/erc/erc-track.el, lisp/erc/erc-networks.el, lisp/erc/erc-netsplit.el: * lisp/erc/erc-dcc.el, lisp/erc/erc-backend.el: Use cl-lib, nth, pcase, and called-interactively-p instead of cl. * lisp/erc/erc-speedbar.el, lisp/erc/erc-services.el: * lisp/erc/erc-pcomplete.el, lisp/erc/erc-notify.el, lisp/erc/erc-match.el: * lisp/erc/erc-log.el, lisp/erc/erc-join.el, lisp/erc/erc-ezbounce.el: * lisp/erc/erc-capab.el: Don't require cl since we don't use it. * lisp/erc/erc.el: Use cl-lib, nth, pcase, and called-interactively-p i.s.o cl. (erc-lurker-ignore-chars, erc-common-server-suffixes): Move before first use. * lisp/json.el: Don't require cl since we don't use it. * lisp/color.el: Don't require cl. (color-complement): `caddr' -> `nth 2'. * test/automated/ert-x-tests.el: Use cl-lib. * test/automated/ert-tests.el: Use lexical-binding and cl-lib.
* * lisp/json.el (json-encode-char): Codes 127 isn't "ASCII printable" either.Stefan Monnier2012-09-271-1/+1
|
* * lisp/json.el (json-encode-char): Codes 128-160 aren't "ASCII printable".Stefan Monnier2012-09-271-4/+4
|
* strict key encoding for json.elEdward O'Connor2012-08-211-3/+16
| | | | | | | | | Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-08/msg00642.html * lisp/json.el (json-key-format): Add error properties. (json-encode-key): New function. (json-encode-hash-table, json-encode-alist, json-encode-plist): Use json-encode-key.
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
|
* Fix typos.Juanma Barranquero2011-11-201-1/+1
|
* * json.el: Bump version to 1.3; (json-alist-p, json-plist-p): Rewrite to ↵Ted Zlatanov2011-10-171-8/+13
| | | | avoid recursion.
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-1/+1
|
* Nuke arch-tags.Glenn Morris2011-01-151-1/+0
|
* Add 2011 to FSF/AIST copyright years.Glenn Morris2011-01-021-1/+1
|
* Fix typos in docstrings.Juanma Barranquero2010-03-221-6/+6
| | | | | | | | | | | | | | | | | | | | | | * image-dired.el (image-dired-display-thumbs): Fix typo in docstring. (image-dired-read-comment): Doc fix. * json.el (json-object-type, json-array-type, json-key-type, json-false) (json-null, json-read-number): * minibuffer.el (completion-in-region-functions): * calendar/cal-tex.el (cal-tex-daily-end, cal-tex-number-weeks) (cal-tex-cursor-week): * emacs-lisp/trace.el (trace-function): * eshell/em-basic.el (eshell/printnl): * eshell/em-dirs.el (eshell-last-dir-ring, eshell-parse-drive-letter) (eshell-read-last-dir-ring, eshell-write-last-dir-ring): * obsolete/levents.el (allocate-event, event-key, event-object) (event-point, event-process, event-timestamp, event-to-character) (event-window, event-x, event-x-pixel, event-y, event-y-pixel): * textmodes/reftex-vars.el (reftex-index-macros-builtin) (reftex-section-levels, reftex-auto-recenter-toc, reftex-toc-mode-hook) (reftex-cite-punctuation, reftex-search-unrecursed-path-first) (reftex-highlight-selection): Fix typos in docstrings.
* Add 2010 to copyright years.Glenn Morris2010-01-131-1/+1
|
* Add 2009 to copyright years.Glenn Morris2009-01-051-1/+1
|
* (json-skip-whitespace): Fix last change.Chong Yidong2008-10-081-1/+1
|
* (json-advance): Use forward-char.Chong Yidong2008-10-071-7/+2
| | | | (json-skip-whitespace): Use skip-syntax-forward.
* (json-read-number): New arg. Handle explicitly signed numbers.Chong Yidong2008-08-281-10/+18
| | | | (json-readtable): Add `+' and `.'.
* (json-alist-p, json-plist-p): Don't use `iff' in docstrings.Juanma Barranquero2008-05-081-2/+2
|
* Switch to recommended form of GPLv3 permissions notice.Glenn Morris2008-05-061-6/+4
|
* Add arch taglineMiles Bader2008-02-231-0/+1
|
* (top-level): No need to require thingatpt.Glenn Morris2008-02-221-3/+2
| | | | (json-read-keyword): Use thing-at-point rather than word-at-point.
* Move lisp/net/json.el to lisp/json.el.Michael Olson2008-02-221-0/+529