Simon Schubert
7c1bf12e5c
* lisp/json.el (json-alist-p): Only return non-nil if the alist has
...
simple keys.
Fixes: debbugs:13518
2013-11-25 00:49:37 +02:00
Stefan Monnier
54bd972f15
* lisp/subr.el (define-error): New function.
...
* doc/lispref/control.texi (Signaling Errors): Refer to define-error.
(Error Symbols): Add `define-error'.
* doc/lispref/errors.texi (Standard Errors): Don't refer to `error-conditions'.
* lisp/progmodes/ada-xref.el (ada-error-file-not-found): Rename from
error-file-not-found and define with define-error.
* lisp/emacs-lisp/cl-lib.el (cl-assertion-failed): Move here from subr.el
and define with define-error.
* lisp/userlock.el (file-locked, file-supersession):
* lisp/simple.el (mark-inactive):
* lisp/progmodes/js.el (js-moz-bad-rpc, js-js-error):
* lisp/progmodes/ada-mode.el (ada-mode-errors):
* lisp/play/life.el (life-extinct):
* lisp/nxml/xsd-regexp.el (xsdre-invalid-regexp, xsdre-parse-error):
* lisp/nxml/xmltok.el (xmltok-markup-declaration-parse-error):
* lisp/nxml/rng-util.el (rng-error):
* lisp/nxml/rng-uri.el (rng-uri-error):
* lisp/nxml/rng-match.el (rng-compile-error):
* lisp/nxml/rng-cmpct.el (rng-c-incorrect-schema):
* lisp/nxml/nxml-util.el (nxml-error, nxml-file-parse-error):
* lisp/nxml/nxml-rap.el (nxml-scan-error):
* lisp/nxml/nxml-outln.el (nxml-outline-error):
* lisp/net/soap-client.el (soap-error):
* lisp/net/gnutls.el (gnutls-error):
* lisp/net/ange-ftp.el (ftp-error):
* lisp/mpc.el (mpc-proc-error):
* lisp/json.el (json-error, json-readtable-error, json-unknown-keyword)
(json-number-format, json-string-escape, json-string-format)
(json-key-format, json-object-format):
* lisp/jka-compr.el (compression-error):
* lisp/international/quail.el (quail-error):
* lisp/international/kkc.el (kkc-error):
* lisp/emacs-lisp/ert.el (ert-test-failed):
* lisp/calc/calc.el (calc-error, inexact-result, math-overflow)
(math-underflow):
* lisp/bookmark.el (bookmark-error-no-filename):
* lisp/epg.el (epg-error): Define with define-error.
2013-08-09 17:22:44 -04:00
Paul Eggert
0877d0dc24
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
2013-01-02 08:13:04 -08:00
Paul Eggert
ab422c4d68
Update copyright notices for 2013.
2013-01-01 09:11:05 +00:00
Paul Eggert
cccaebd24d
Spelling fixes.
...
My favorite was that the word "dictionary" was misspelled.
Also, correct the title in the DeRemer & Pennello 1982 citation,
and add a URL.
2012-12-14 12:05:03 -08:00
Ryan Crum
d72e9e922f
* lisp/json.el: Add pretty-print option.
...
(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
2012-12-14 09:57:37 -05:00
Stefan Monnier
19dc72069c
Use cl-lib instead of cl, and interactive-p => called-interactively-p.
...
* 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.
2012-11-19 12:24:12 -05:00
Stefan Monnier
e28e67b3a3
* lisp/json.el (json-encode-char): Codes 127 isn't "ASCII printable" either.
2012-09-27 18:55:03 -04:00
Stefan Monnier
9cad61d6db
* lisp/json.el (json-encode-char): Codes 128-160 aren't "ASCII printable".
2012-09-27 09:10:54 -04:00
Edward O'Connor
94e0e5592a
strict key encoding for json.el
...
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.
2012-08-21 21:29:22 -04:00
Glenn Morris
acaf905b11
Add 2012 to FSF copyright years for Emacs files
2012-01-05 01:46:05 -08:00
Juanma Barranquero
fe7a3057a3
Fix typos.
2011-11-20 20:35:27 +01:00
Ted Zlatanov
0bc0638017
* json.el: Bump version to 1.3; (json-alist-p, json-plist-p): Rewrite to avoid recursion.
2011-10-17 13:40:27 -04:00
Glenn Morris
73b0cd5003
Convert consecutive FSF copyright years to ranges.
2011-01-24 20:08:28 -08:00
Glenn Morris
0d9f702fd0
Nuke arch-tags.
2011-01-15 15:16:57 -08:00
Glenn Morris
5df4f04cd3
Add 2011 to FSF/AIST copyright years.
2011-01-02 15:50:46 -08:00
Juanma Barranquero
c8de140b34
Fix typos in docstrings.
...
* 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.
2010-03-22 17:50:29 +01:00
Glenn Morris
114f9c9679
Add 2010 to copyright years.
2010-01-13 00:35:10 -08:00
Glenn Morris
ae940284fa
Add 2009 to copyright years.
2009-01-05 03:18:22 +00:00
Chong Yidong
b111d5d054
(json-skip-whitespace): Fix last change.
2008-10-08 15:52:43 +00:00
Chong Yidong
ac611f4ffa
(json-advance): Use forward-char.
...
(json-skip-whitespace): Use skip-syntax-forward.
2008-10-07 16:18:22 +00:00
Chong Yidong
7712319db8
(json-read-number): New arg. Handle explicitly signed numbers.
...
(json-readtable): Add `+' and `.'.
2008-08-28 20:19:17 +00:00
Juanma Barranquero
398d17daba
(json-alist-p, json-plist-p): Don't use `iff' in docstrings.
2008-05-08 03:37:07 +00:00
Glenn Morris
eb3fa2cfcf
Switch to recommended form of GPLv3 permissions notice.
2008-05-06 08:06:51 +00:00
Miles Bader
2872062129
Add arch tagline
2008-02-23 08:28:42 +00:00
Glenn Morris
f62e3e0a29
(top-level): No need to require thingatpt.
...
(json-read-keyword): Use thing-at-point rather than word-at-point.
2008-02-22 03:56:25 +00:00
Michael Olson
00c03cbeba
Move lisp/net/json.el to lisp/json.el.
2008-02-22 01:14:03 +00:00