[Emacs-diffs] master updated (874f69a -> 037aabb)

[Glenn Morris]

gm pushed a change to branch master.

      from  874f69a   * admin/gitmerge.el (gitmerge-skip-regexp): Add yet 
another variant.
      adds  c7897c2   A few further fixes of window internals description
      adds  e568202   * lisp/simple.el (next-line-or-history-element): Use 
current-column
      adds  2b9e993   ; * doc/lispref/text.texi (Special Properties): Fix 
wording.  (Bug#33663)
      adds  1d743d2   Fix scaling problem in Cairo builds
      adds  1e3e24d   ; * src/xterm.c (x_update_begin): Fix whitespace.
      adds  18442da   Tramp multi-hop methods must be inline
      adds  d817d2c   * doc/lispref/commands.texi (Adjusting Point): Bug#33662
      adds  505ac9a   Improve documentation of cursor-sensor.el (bug#33664)
      adds  908af9d   Indexing followup to recent changes
       new  3d353ce   Merge from origin/emacs-26
      adds  ee1ebe8   Guard occur against an undefined orig-line
       new  6383844   ; Merge from origin/emacs-26
      adds  b0ed9d1   * lisp/emacs-lisp/cursor-sensor.el: Add motivation
      adds  5a7451c   CC Mode: stop wrongly recognizing "func(a * 9)" as 
"pointer to type a"
       new  e60fc32   Merge from origin/emacs-26
      adds  0220391   Fix cairo scrolling for side-by-side windows
       new  fd1afe2   ; Merge from origin/emacs-26
      adds  2075864   CC Mode: stop extra parens on expression causing false 
fontification as type
       new  037aabb   Merge from origin/emacs-26


Summary of changes:
 doc/lispref/commands.texi        |   3 +-
 doc/lispref/internals.texi       |  96 ++++++++++++++++++--------
 doc/lispref/text.texi            |  10 ++-
 doc/misc/tramp.texi              |   2 +
 lisp/emacs-lisp/cursor-sensor.el |  47 +++++++++++--
 lisp/progmodes/cc-engine.el      |   8 ++-
 lisp/progmodes/cc-fonts.el       |   8 ++-
 lisp/simple.el                   |  22 ++++--
 src/window.h                     | 142 ++++++++++++++++++++++-----------------
 src/xterm.c                      |  14 ++--
 10 files changed, 242 insertions(+), 110 deletions(-)