master updated (0ac626f1d4 -> c6df541783)

[Po Lu]

oldosfan pushed a change to branch master.

      from  0ac626f1d4 Use substitute-command-keys for buffer-menu help
       new  833e60ae1a Fix recent Cairo xsettings changes
       new  c6df541783 More fixes to last change


Summary of changes:
 lisp/dynamic-setting.el | 18 +++++-------------
 src/frame.c             | 28 ++++++++++++++++++++++++++--
 src/ftcrfont.c          | 38 +++++++++++++++++++++++++++++++++++++-
 src/ftfont.h            |  7 +++++++
 src/xfns.c              |  8 +++++---
 src/xsettings.c         |  2 ++
 src/xterm.h             |  2 +-
 7 files changed, 83 insertions(+), 20 deletions(-)