master updated (3e4d4f472d -> 8a7df412a6)

[Po Lu]

oldosfan pushed a change to branch master.

      from  3e4d4f472d Rework `abbreviate-file-name' in Tramp
       new  4b0e1c6502 Handle color allocation failures caused by colormap 
changes
       new  8a7df412a6 Improve color handling on colormapped displays


Summary of changes:
 src/xfns.c  | 18 ++++++++++++----
 src/xterm.c | 69 +++++++++++++++++++++++++++++++++++++++++++++----------------
 src/xterm.h |  6 ++++++
 3 files changed, 71 insertions(+), 22 deletions(-)