[Emacs-diffs] master updated (f7c5f79 -> 969c8a3)

[Paul Eggert]

eggert pushed a change to branch master.

      from  f7c5f79   Restore the point in grep buffers when traversing the 
history
      adds  2244331   Finish fixing a cacheing bug in CC Mode (see 2016-03-09)
      adds  df441b3   Fix OS X specific settings in tramp-tests
      adds  e30c3e9   Fix EOL decoding in vc-annotate with SVN back-end on 
MS-Windows
      adds  a3daa34   Teach M-x disassemble a default argument.
      adds  b3b523c   Avoid crashes due to insanely large columns in 
tabulated-list-format
      adds  9151f16   Prevent C++ Mode wrongly fontifying some identifiers near 
templates as types
      adds  2d02a5f   ; * lisp/vc/vc-annotate.el (vc-annotate): Clarify 
commentary.
      adds  c28f87a   (js--continued-expression-p): Special-case unary plus and 
minus
      adds  17b5152   Improve vc-diff with Git backend
      adds  0020047   Adapt calls to 'format-time-string' to changes in Emacs 25
      adds  7228eb8   Improve documentation of byte-code objects
      adds  1042217   Document incompatible changes in 'format-time-string'
      adds  36e05f0   Remove unused arguments from make-xwidget
      adds  13c8f29   make-xwidget unused arg cleanup
      adds  b787d55   More format-time-string change fixups
       new  b1c7207   Merge from origin/emacs-25
      adds  06ae23a   Handle Bug#23186
       new  368cb23   ; Merge from origin/emacs-25
      adds  787df9d   ; * src/keyboard.c (read_char): Fix typos in a comment.
       new  969c8a3   Merge from origin/emacs-25


Summary of changes:
 doc/lispref/compile.texi    |   25 +++--
 doc/lispref/display.texi    |    9 +-
 etc/NEWS                    |    5 +
 lisp/emacs-lisp/disass.el   |   10 ++-
 lisp/gnus/gmm-utils.el      |    2 +-
 lisp/net/tramp.el           |   20 ++++
 lisp/org/org.el             |    9 +-
 lisp/org/ox-icalendar.el    |    3 +-
 lisp/progmodes/cc-cmds.el   |  249 +++++++++++++++++++++----------------------
 lisp/progmodes/cc-defs.el   |   52 ++++++---
 lisp/progmodes/cc-engine.el |   38 +++++--
 lisp/progmodes/cc-fonts.el  |   13 ++-
 lisp/progmodes/js.el        |   24 +++--
 lisp/vc/pcvs-info.el        |    2 +-
 lisp/vc/vc-annotate.el      |    9 ++
 lisp/vc/vc-git.el           |    9 +-
 lisp/xwidget.el             |    7 +-
 src/keyboard.c              |    2 +-
 src/term.c                  |    1 +
 src/xdisp.c                 |   11 ++-
 src/xwidget.c               |   28 ++---
 test/manual/indent/js.js    |    6 +
 22 files changed, 314 insertions(+), 220 deletions(-)