master updated (423bdd5f7f -> 2c331dbb4e)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  423bdd5f7f ; Fix typos (prefer American spelling)
       new  5281946fbf Make format-spec accept function substitutions
       new  b71241742c Prompt for wallpaper width/height only when needed
       new  2c331dbb4e wallpaper-set: Get monitor name on non-graphical display


Summary of changes:
 doc/lispref/strings.texi       |  5 ++++
 etc/NEWS                       |  6 +++++
 lisp/format-spec.el            | 17 ++++++++++--
 lisp/image/wallpaper.el        | 61 +++++++++++++++++++++++++++++++-----------
 test/lisp/format-spec-tests.el | 11 ++++++++
 5 files changed, 83 insertions(+), 17 deletions(-)