• Paul Eggert's avatar
    Merge from origin/emacs-24 · 6ddd8194
    Paul Eggert authored
    a5f90a37 * .gitattributes: New file.
    5a9710f6 Make sure tool-bar changes are reflected on display.
    93796bae * autogen.sh: Port better to non-GNU 'cp'.
    97585164 Fix a typo in a comment in the previous commit.
    aa472a37 Fix the pixel coordinates returned by pos-visible-in-window-p.  (Bug#19473)
    d2612290 * 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.
    9278f058 Omit trailing white space
    1c93fd38 Sync with Tramp 2.2.11.
    96ebe180 Sync with Tramp 2.2.11.
    e792450d Sync with Tramp 2.2.11.
    2d17e122 Fix ChangeLog entry.
    6444482c Fix auto-revert-tail-mode for remote files
    b5c9c131 Spelling fixes
    c5504d10 src/w32proc.c (Fw32_get_codepage_charset): Doc fix.  (Bug#19458)
    
    Conflicts:
    	ChangeLog
    	doc/misc/ChangeLog
    	lisp/ChangeLog
    	src/ChangeLog
    	test/ChangeLog
    6ddd8194
autogen.sh 6.73 KB