~ubuntu-elisp/emacs/+git/master:scratch/support-plists-in-jsonc

Last commit made on 2018-05-30
Get this branch:
git clone -b scratch/support-plists-in-jsonc https://git.launchpad.net/~ubuntu-elisp/emacs/+git/master

Branch merges

Branch information

Name:
scratch/support-plists-in-jsonc
Repository:
lp:~ubuntu-elisp/emacs/+git/master

Recent commits

506d384... by =?utf-8?b?Sm/Do28gVMOhdm9yYQ==?= <email address hidden>

Instead of a json-serialize-use-plists global, use function args

* src/json.c (syms_of_json): Don't defive
json-serialize-use-plists
(Fjson_insert, lisp_to_json, list_to_json_toplevel_1)
(list_to_json_toplevel, Fjson_serialize): Use and pass around
use_plists arg.

* doc/lispref/text.texi:
(Parsing JSON): json-serialize and json-insert now have a
USE-PLISTS arg.

* test/src/json-tests.el (json-serialize/object): Use
json-serialize's USE-PLISTS arg.

224f8ea... by =?utf-8?b?Sm/Do28gVMOhdm9yYQ==?= <email address hidden>

Support plists in json.c

* doc/lispref/text.texi (Parsing JSON): Mention plists and
json-serialize-use-plists.

* src/json.c (lisp_to_json_toplevel_1): Decide with
Vjson_serialize_use_plists.
(Fjson_serialize): Update docstring.
(enum json_object_type): Add json_object_plist.
(json_to_lisp): Can build plists.
(json_parse_object_type): Accept plists.
(Fjson_parse_string): Update docstring.
(json-serialize-use-plist): New DEFVAR_LISP.
(Qplist): New sym_of_json

* test/src/json-tests.el (json-serialize/object): Do some tests
with json-serialize-use-plists to t.
(json-parse-string/object): Parse something as a plist.

fd6f088... by Michael Albinus

* doc/misc/tramp.texi (All): Use @code instead of @option for user options.

e5b98e0... by Michael Albinus

Merge from origin/emacs-26

13963a3a5c * doc/misc/tramp.texi (All): Use @code instead of @option ...
6e5f19ada4 Fix Bug#31605

13963a3... by Michael Albinus

* doc/misc/tramp.texi (All): Use @code instead of @option for user options.

6e5f19a... by Michael Albinus

Fix Bug#31605

* doc/misc/tramp.texi (All): Add @vindex entries for
environment variables.
(Remote shell setup): New items `tramp-terminal-type' and
"Determining a Tramp session".
(Frequently Asked Questions): Adapt zsh example. (Bug#31605)

b320753... by Michael Albinus

; Merge from origin/emacs-26

The following commit was skipped:

e8912d5be9 Sync with Tramp 2.3.4-pre

25daf56... by Michael Albinus

Merge from origin/emacs-26

9a7a2e919a ; ChangeLog.3: Remove stray phrase.

0f2a560... by Michael Albinus

; Merge from origin/emacs-26

The following commit was skipped:

038063651e Bump Emacs version to 26.1.50

8a09ec0... by Michael Albinus

Merge from origin/emacs-26

9d6a3ac73a Mention pcase as a fifth conditional form
567cb9046d Overhaul pcase documentation
4d7e54acff Use EXPVAL in docstrings of patterns defined using pcase-d...
7e8227ed68 Introduce EXPVAL for pcase, pcase-defmacro docstrings
e6de5b3d51 Ensure pcase doc shows `QPAT first among extensions