From: Glenn Morris <rgm@gnu.org>
Date: Fri, 16 Feb 2018 17:44:04 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~5676
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=47106da23ac2b19ad994eed95cdcb0d33535281d;p=emacs.git

Merge from origin/emacs-26

a06a8ed (origin/emacs-26) ; * lisp/vc/vc-git.el (vc-git--program-vers...
edc06ad Make 'byte-compile-error-on-warn' a safe file variable
9f5d8da ; * lisp/textmodes/flyspell.el (flyspell-auto-correct-word): ...
f73905a Fix the doc string of flyspell-auto-correct-word
e9c7ddc Improve the MS-Windows appendix of the Emacs manual
6ddb4bd Fix 'vc-git--program-version'
63c93f7 Fix typos and wording in the Emacs manual
42f15b0 * doc/emacs/programs.texi (Semantic): Order programming langu...
b46be29 More improvements for the Emacs manual
874c0ed Minor wording change in Emacs manual
53511f9 Another set of changes for the manual
78426b8 Improvements on tramp.texi
0dca618 Tramp minor doc fixes

Conflicts:
	doc/misc/tramp.texi
---

47106da23ac2b19ad994eed95cdcb0d33535281d
diff --cc doc/misc/tramp.texi
index e21df5ac39b,e264298efcf..0dd82c582c2
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@@ -1898,9 -1878,8 +1896,8 @@@ Similar localization may be necessary f
  prompts, for which @value{tramp} uses @option{tramp-wrong-passwd-regexp}.
  
  @item @command{tset} and other questions
 -@cindex unix command tset
 -@cindex tset unix command
 +@cindex unix command @command{tset}
 +@cindex @command{tset} unix command
- @vindex tramp-terminal-type
  
  @vindex tramp-terminal-type
  To suppress inappropriate prompts for terminal type, @value{tramp}
@@@ -2233,12 -2211,13 +2229,13 @@@ to direct all auto saves to that locati
  
  This section is incomplete.  Please share your solutions.
  
 -@cindex method sshx with cygwin
 -@cindex sshx method with cygwin
 +@cindex method @option{sshx} with cygwin
 +@cindex @option{sshx} method with cygwin
  
  Cygwin's @command{ssh} works only with a Cygwin version of Emacs.  To
- check for compatibility: type @kbd{M-x eshell}, and start @kbd{ssh
- test.host}.  Incompatibilities trigger this message:
+ check for compatibility: type @kbd{M-x eshell @key{RET}}, and start
+ @kbd{ssh test.host @key{RET}}.  Incompatibilities trigger this
+ message:
  
  @example
  Pseudo-terminal will not be allocated because stdin is not a terminal.