From: Glenn Morris <rgm@gnu.org>
Date: Sat, 2 Jun 2018 17:29:38 +0000 (-0700)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~4956
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d3f94d2869af87e7fb8f18f9f9cdc6e0b9bdd20b;p=emacs.git

; Merge from origin/emacs-26

The following commits were skipped:

6e0ff4c Fix decoding of directories when "~" includes non-ASCII chars
35c1ab1 Don't remove highlight of misspelled word on pdict save
aac541e Fix some problems in the Cairo build
e96245a Avoid infloops in font_open_entity
3a06e72 Fix encoding of characters when using GB18030 fonts
7782550 Fix C-p and C-n when wrap-prefix is too wide
9804482 Avoid redisplay problems with too wide wrap-prefix
5ee9ccf Fix 'posn-at-point' when line numbers are displayed
c4db766 Another followup to fixing 'window-text-pixel-width'
a6cf7be Fix mouse-set-point when line numbers are displayed
ae78b14 * src/xdisp.c (Fwindow_text_pixel_size): Fix last change.
f1f12d8 Fix 'window-text-pixel-size' when display properties are around
8b2b4b5 Fix display of TABs in hscrolled windows with line numbers
de69d28 Fix wait_reading_process_output wait_proc hang
---

d3f94d2869af87e7fb8f18f9f9cdc6e0b9bdd20b