Merge from origin/emacs-26

675edec (origin/emacs-26) Fix some allout.el aliases
b2c069a * lisp/progmodes/ada-mode.el (ada-clean-buffer-before-saving)...
2f5420c Doc fixes re obsolete items
9edf82a Replace an obsolete alias in tpu-mapper
a643792 Doc fixes re obsolete items
3060fb8 Minor changes in mule.texi
3e39897 Avoid assertion violation under visual-order-cursor-movement
e4b73ab Stop mentioning options.el in doc
05669f0 ; * lisp/minibuffer.el (completion-cycle-threshold): Fix last...
758597f * lisp/vc/vc-dir.el (vc-dir-unmark): Fix documentation.
62f0a2b * lisp/minibuffer.el (completion-cycle-threshold): Doc fix.
761845c Fix last change in Xref documentation
5186675 More changes in the Emacs manual
b1aaa72 Improve documentation of Xref

Conflicts:
	lisp/w32-fns.el

diff --cc doc/emacs/custom.texi
Simple merge

diff --cc doc/emacs/dired.texi
Simple merge

diff --cc doc/emacs/mini.texi
Simple merge

diff --cc doc/emacs/text.texi
Simple merge

diff --cc lisp/allout.el
Simple merge

diff --cc lisp/hilit-chg.el
Simple merge

diff --cc lisp/minibuffer.el
Simple merge

diff --cc lisp/vc/vc-dir.el
Simple merge

diff --cc lisp/w32-fns.el
index b400c8d4a6fe5816980c02c509927d2e203a54a9,9b9d3ce9adc85c6301eb34e05c2f11554140b299..825420c4261a7243edbe95fc36c6df5cced3663a
--- 1/lisp/w32-fns.el
--- 2/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@@ -254,48 -259,47 +254,48 @@@ bit output with no translation.
    (add-to-list 'w32-charset-info-alist
                 (cons xlfd-charset (cons windows-charset codepage))))
  
 -;; The last charset we add becomes the "preferred" charset for the return
 -;; value from x-select-font etc, so list the most important charsets last.
 -(w32-add-charset-info "iso8859-14" 'w32-charset-ansi  28604)
 -(w32-add-charset-info "iso8859-15" 'w32-charset-ansi  28605)
 -;; The following two are included for pattern matching.
 -(w32-add-charset-info "jisx0201" 'w32-charset-shiftjis 932)
 -(w32-add-charset-info "jisx0208" 'w32-charset-shiftjis 932)
 -(w32-add-charset-info "jisx0201-latin" 'w32-charset-shiftjis 932)
 -(w32-add-charset-info "jisx0201-katakana" 'w32-charset-shiftjis 932)
 -(w32-add-charset-info "ksc5601.1989" 'w32-charset-hangeul 949)
 -(w32-add-charset-info "big5" 'w32-charset-chinesebig5 950)
 -(w32-add-charset-info "gb2312.1980" 'w32-charset-gb2312 936)
 -(w32-add-charset-info "ms-symbol" 'w32-charset-symbol nil)
 -(w32-add-charset-info "ms-oem" 'w32-charset-oem 437)
 -(w32-add-charset-info "ms-oemlatin" 'w32-charset-oem 850)
 -(w32-add-charset-info "iso8859-2" 'w32-charset-easteurope 28592)
 -(w32-add-charset-info "iso8859-3" 'w32-charset-turkish 28593)
 -(w32-add-charset-info "iso8859-4" 'w32-charset-baltic 28594)
 -(w32-add-charset-info "iso8859-6" 'w32-charset-arabic 28596)
 -(w32-add-charset-info "iso8859-7" 'w32-charset-greek 28597)
 -(w32-add-charset-info "iso8859-8" 'w32-charset-hebrew 1255)
 -(w32-add-charset-info "iso8859-9" 'w32-charset-turkish 1254)
 -(w32-add-charset-info "iso8859-13" 'w32-charset-baltic 1257)
 -(w32-add-charset-info "koi8-r" 'w32-charset-russian 20866)
 -(w32-add-charset-info "iso8859-5" 'w32-charset-russian 28595)
 -(w32-add-charset-info "tis620-2533" 'w32-charset-thai 874)
 -(w32-add-charset-info "windows-1258" 'w32-charset-vietnamese 1258)
 -(w32-add-charset-info "ksc5601.1992" 'w32-charset-johab 1361)
 -(w32-add-charset-info "mac-roman" 'w32-charset-mac 10000)
 -(w32-add-charset-info "iso10646-1" 'w32-charset-default t)
 -
 -;;   ;; If Unicode Windows charset is not defined, use ansi fonts.
 -;;   (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t))
 -
 -;; Preferred names
 -(w32-add-charset-info "big5-0" 'w32-charset-chinesebig5 950)
 -(w32-add-charset-info "gb2312.1980-0" 'w32-charset-gb2312 936)
 -(w32-add-charset-info "jisx0208-sjis" 'w32-charset-shiftjis 932)
 -(w32-add-charset-info "ksc5601.1987-0" 'w32-charset-hangeul 949)
 -(w32-add-charset-info "tis620-0" 'w32-charset-thai 874)
 -(w32-add-charset-info "iso8859-1" 'w32-charset-ansi 1252)
 +(when (boundp 'w32-charset-info-alist)
 +  ;; The last charset we add becomes the "preferred" charset for the return
-   ;; value from w32-select-font etc, so list the most important charsets last.
++  ;; value from x-select-font etc, so list the most important charsets last.
 +  (w32-add-charset-info "iso8859-14" 'w32-charset-ansi  28604)
 +  (w32-add-charset-info "iso8859-15" 'w32-charset-ansi  28605)
 +  ;; The following two are included for pattern matching.
 +  (w32-add-charset-info "jisx0201" 'w32-charset-shiftjis 932)
 +  (w32-add-charset-info "jisx0208" 'w32-charset-shiftjis 932)
 +  (w32-add-charset-info "jisx0201-latin" 'w32-charset-shiftjis 932)
 +  (w32-add-charset-info "jisx0201-katakana" 'w32-charset-shiftjis 932)
 +  (w32-add-charset-info "ksc5601.1989" 'w32-charset-hangeul 949)
 +  (w32-add-charset-info "big5" 'w32-charset-chinesebig5 950)
 +  (w32-add-charset-info "gb2312.1980" 'w32-charset-gb2312 936)
 +  (w32-add-charset-info "ms-symbol" 'w32-charset-symbol nil)
 +  (w32-add-charset-info "ms-oem" 'w32-charset-oem 437)
 +  (w32-add-charset-info "ms-oemlatin" 'w32-charset-oem 850)
 +  (w32-add-charset-info "iso8859-2" 'w32-charset-easteurope 28592)
 +  (w32-add-charset-info "iso8859-3" 'w32-charset-turkish 28593)
 +  (w32-add-charset-info "iso8859-4" 'w32-charset-baltic 28594)
 +  (w32-add-charset-info "iso8859-6" 'w32-charset-arabic 28596)
 +  (w32-add-charset-info "iso8859-7" 'w32-charset-greek 28597)
 +  (w32-add-charset-info "iso8859-8" 'w32-charset-hebrew 1255)
 +  (w32-add-charset-info "iso8859-9" 'w32-charset-turkish 1254)
 +  (w32-add-charset-info "iso8859-13" 'w32-charset-baltic 1257)
 +  (w32-add-charset-info "koi8-r" 'w32-charset-russian 20866)
 +  (w32-add-charset-info "iso8859-5" 'w32-charset-russian 28595)
 +  (w32-add-charset-info "tis620-2533" 'w32-charset-thai 874)
 +  (w32-add-charset-info "windows-1258" 'w32-charset-vietnamese 1258)
 +  (w32-add-charset-info "ksc5601.1992" 'w32-charset-johab 1361)
 +  (w32-add-charset-info "mac-roman" 'w32-charset-mac 10000)
 +  (w32-add-charset-info "iso10646-1" 'w32-charset-default t)
 +
 +  ;;   ;; If Unicode Windows charset is not defined, use ansi fonts.
 +  ;;   (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t))
 +
 +  ;; Preferred names
 +  (w32-add-charset-info "big5-0" 'w32-charset-chinesebig5 950)
 +  (w32-add-charset-info "gb2312.1980-0" 'w32-charset-gb2312 936)
 +  (w32-add-charset-info "jisx0208-sjis" 'w32-charset-shiftjis 932)
 +  (w32-add-charset-info "ksc5601.1987-0" 'w32-charset-hangeul 949)
 +  (w32-add-charset-info "tis620-0" 'w32-charset-thai 874)
 +  (w32-add-charset-info "iso8859-1" 'w32-charset-ansi 1252))
  
  \f
  ;;;; Support for build process

diff --cc src/xdisp.c
Simple merge