master updated (a058d61615d -> 4ffd16b8e5e)

[Po Lu]

oldosfan pushed a change to branch master.

      from  a058d61615d Delete unused macros (SF#494)
       new  2bbd50a03d6 ; * src/buffer.c (Ffind_buffer): Fix coding style in 
recent change.
       new  4ffd16b8e5e Prevent overlapping sections of glyphs from being 
misaligned


Summary of changes:
 src/buffer.c | 2 +-
 src/xdisp.c  | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)