Merge from origin/emacs-26

908af9d Indexing followup to recent changes
505ac9a Improve documentation of cursor-sensor.el (bug#33664)
d817d2c * doc/lispref/commands.texi (Adjusting Point): Bug#33662
18442da Tramp multi-hop methods must be inline
1e3e24d ; * src/xterm.c (x_update_begin): Fix whitespace.
1d743d2 Fix scaling problem in Cairo builds
2b9e993 ; * doc/lispref/text.texi (Special Properties): Fix wording. ...
e568202 * lisp/simple.el (next-line-or-history-element): Use current-...
c7897c2 A few further fixes of window internals description

# Conflicts:
#	doc/misc/tramp.texi

diff --cc doc/lispref/internals.texi
Simple merge

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

diff --cc doc/misc/tramp.texi
index d5a45ad27c6efbf45ba9e2193767cc0be28d6f04,d8bd85025c6ea49b60c6b4b785e56e2f82bdd6a2..5c5402133a7e976960302b9ea371a8e4ad1eaad0
--- 1/doc/misc/tramp.texi
--- 2/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@@ -2739,6 -2594,10 +2739,8 @@@ proxy @samp{bird@@bastion} to a remote 
  @kbd{C-x C-f @value{prefix}ssh@value{postfixhop}bird@@bastion|ssh@value{postfixhop}you@@remotehost@value{postfix}/path @key{RET}}
  @end example
  
 -Proxies can take patterns @code{%h} or @code{%u}.
 -
+ Each involved method must be an inline method (@pxref{Inline methods}).
+ 
  @value{tramp} adds the ad-hoc definitions on the fly to
  @code{tramp-default-proxies-alist} and is available for re-use
  during that Emacs session.  Subsequent @value{tramp} connections to

diff --cc lisp/simple.el
Simple merge

diff --cc src/window.h
Simple merge

diff --cc src/xterm.c
Simple merge