• Fabián Ezequiel Gallina's avatar
    Merge from origin/emacs-24 · 3a12f2ed
    Fabián Ezequiel Gallina authored
    2616307f * net/tramp-sh.el (tramp-send-command-and-read): New optional arg MARKER. (tramp-get-remote-path): Use it.
    c773edcf * net/tramp-gw.el (tramp-gw-open-connection): Suppress traces in wrong debug buffer. (tramp-gw-open-connection): Set process coding system 'binary. (tramp-gw-open-network-stream): Handle HTTP error 403.
    8032fc16 * .gitignore: Ignore /conftest*.
    fb420e77 * lisp/subr.el (sit-for): Tweak docstring.
    061db139 Fix vc-git-dir-status-files WRT up-to-date vs edited
    bb57c94d Consider electric-pair-mode in tex-mode.
    7b945728 * test/automated/flymake/warnpred/test.pl: Tweak earlier change.
    59c218fa ChangeLog fix
    db2a7681 * test/automated/flymake/warnpred/test.pl: Tweak format
    d9005dd5 src/gnutls.c (gnutls_init): Fix deprecation warning from GCC.
    
    Conflicts:
    	ChangeLog
    	lisp/ChangeLog
    	src/ChangeLog
    	test/ChangeLog
    3a12f2ed
.gitignore 4.5 KB