[Emacs-diffs] master updated (935fa61 -> 6ddd819)

[Paul Eggert]

eggert pushed a change to branch master.

      from  935fa61   * lisp/textmodes/css-mode.el (scss-mode): Fix typo.
      adds  c5504d1   src/w32proc.c (Fw32_get_codepage_charset): Doc fix.  
(Bug#19458)
      adds  b5c9c13   Spelling fixes
      adds  6444482   Fix auto-revert-tail-mode for remote files
      adds  2d17e12   Fix ChangeLog entry.
      adds  e792450   Sync with Tramp 2.2.11.
      adds  96ebe18   Sync with Tramp 2.2.11.
      adds  1c93fd3   Sync with Tramp 2.2.11.
      adds  9278f05   Omit trailing white space
      adds  d261229   * automated/tramp-tests.el 
(tramp--test-smb-or-windows-nt-p): New defun. 
(tramp-test30-special-characters): Use it. (tramp--test-check-files): Filter 
nil file names out.
      adds  aa472a3   Fix the pixel coordinates returned by 
pos-visible-in-window-p.  (Bug#19473)
      adds  9758516   Fix a typo in a comment in the previous commit.
      adds  93796ba   * autogen.sh: Port better to non-GNU 'cp'.
      adds  5a9710f   Make sure tool-bar changes are reflected on display.
      adds  a5f90a3   * .gitattributes: New file.
       new  6ddd819   Merge from origin/emacs-24


Summary of changes:
 .gitattributes                |   40 ++++++++++++++++++++++++++++++++++++++++
 ChangeLog                     |    9 +++++++++
 autogen.sh                    |    2 +-
 doc/man/ChangeLog             |    1 -
 doc/misc/ChangeLog            |    5 +++++
 doc/misc/trampver.texi        |    2 +-
 lisp/ChangeLog                |   23 +++++++++++++++++++++++
 lisp/autorevert.el            |   17 ++++++++---------
 lisp/net/tramp-compat.el      |    9 +++++++++
 lisp/net/tramp-smb.el         |    2 +-
 lisp/net/trampver.el          |    4 ++--
 lisp/progmodes/python.el      |    8 ++++----
 lisp/tool-bar.el              |    6 ++++--
 nt/ChangeLog                  |    2 +-
 src/ChangeLog                 |    9 +++++++++
 src/ChangeLog.10              |    2 +-
 src/ChangeLog.12              |    4 ++--
 src/w32proc.c                 |    7 ++++++-
 src/xdisp.c                   |   23 +++++++++++++++++++----
 test/ChangeLog                |   16 +++++++++++++++-
 test/automated/tramp-tests.el |   34 ++++++++++++++++++++--------------
 21 files changed, 180 insertions(+), 45 deletions(-)
 create mode 100644 .gitattributes