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, 12 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 90d7c0bb613..dd0875e82d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-12-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * .gitignore: Ignore /conftest*.
+
+2014-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * build-aux/git-hooks/commit-msg (at_sign): Bump up line-length limit
+        to 78.
+
+2014-12-27  Paul Eggert  <eggert@cs.ucla.edu>
 2014-12-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         Prefer stpcpy to strcat
@@ -308,7 +318,8 @@
 
 2014-11-11  Eric S. Raymond  <esr@thyrsus.com>
 
-        * Makefile.in: git transition - set VCWITNESS appropriately for git.
+        Git transition.
+        * Makefile.in (src): Set VCSWITNESS appropriately for git.
 
         All bzr revision IDS, and all CVS revision IDs for which a commit
         could be identified, were changed to time-date!committer version