master updated (0b9c7148fd6 -> 5af4e346b0b)

[Po Lu]

oldosfan pushed a change to branch master.

      from  0b9c7148fd6 Respect the delimiter of completer in Python shell 
completion
       new  8290a1bacb0 Replace a few calls to intern with constant strings
       new  5af4e346b0b Don't lose track of adstyles during face merging


Summary of changes:
 src/fns.c    |  6 ++++--
 src/lread.c  |  7 ++++++-
 src/xfaces.c | 35 +++++++++++++++++++++++++++--------
 3 files changed, 37 insertions(+), 11 deletions(-)