master updated (557c595 -> aa8859d)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  557c595   Fix problem with certain fonts in ftfont_shape_by_flt
       new  7edbcb3   Quit minibuffers without aborting kmacros
       new  aa8859d   Signal an error in json.c function if not available


Summary of changes:
 doc/lispref/commands.texi | 14 +++++++++++---
 doc/lispref/errors.texi   |  9 +++++++--
 etc/NEWS                  |  9 +++++++++
 lisp/minibuffer.el        |  9 +++++++++
 lisp/simple.el            |  6 ++++--
 src/data.c                |  2 ++
 src/json.c                | 25 +++++++++----------------
 src/keyboard.c            | 45 +++++++++++++++++++++++++++++++++------------
 src/lisp.h                |  2 +-
 src/macros.c              |  2 +-
 src/minibuf.c             |  2 +-
 11 files changed, 87 insertions(+), 38 deletions(-)