Merge from origin/emacs-24

2616307 * net/tramp-sh.el (tramp-send-command-and-read): New optional arg MARKER. (tramp-get-remote-path): Use it.
c773edc * 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.
8032fc1 * .gitignore: Ignore /conftest*.
fb420e7 * lisp/subr.el (sit-for): Tweak docstring.
061db13 Fix vc-git-dir-status-files WRT up-to-date vs edited
bb57c94 Consider electric-pair-mode in tex-mode.
7b94572 * test/automated/flymake/warnpred/test.pl: Tweak earlier change.
59c218f ChangeLog fix
db2a768 * test/automated/flymake/warnpred/test.pl: Tweak format
d9005dd src/gnutls.c (gnutls_init): Fix deprecation warning from GCC.

Conflicts:
	ChangeLog
	lisp/ChangeLog
	src/ChangeLog
	test/ChangeLog

1 files changed, 11 insertions, 0 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index fda30d9237c..4e59ee0afbf 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,14 @@
+2014-12-27  João Távora  <joaotavora@gmail.com>
+
+        * automated/electric-tests.el (autowrapping-7): Tests for
+        tex-mode.
+
+2014-12-27  Glenn Morris  <rgm@gnu.org>
+
+        * automated/flymake/warnpred/test.pl: Tweak format, since the
+        previous one seems to have stopped giving a warning with perl 5.20.1.
+
+2014-12-27  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 2014-12-26  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
         * automated/python-tests.el (python-shell-get-process-name-1)