Fabián Ezequiel Gallina 3a12f2ed99 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		2014-12-27 13:15:55 -03:00
..
git-hooks	* lisp/subr.el (sit-for): Tweak docstring.	2014-12-15 15:09:04 -05:00
snippet	Update copyright year to 2014 by running admin/update-copyright.	2014-01-01 07:43:34 +00:00
dir_top	Stop keeping info/dir in the repository.	2013-12-12 00:54:21 -08:00
make-info-dir	Fix race in 'make info/dir', and speed it up.	2014-10-22 20:32:21 -07:00
move-if-change	Update copyright year to 2014 by running admin/update-copyright.	2014-01-01 07:43:34 +00:00
msys-to-w32	build-aux/msys-to-w32: Simplify implementation and docstring.	2014-11-19 21:15:32 +01:00
update-copyright	Update copyright year to 2014 by running admin/update-copyright.	2014-01-01 07:43:34 +00:00
update-subdirs	Update copyright year to 2014 by running admin/update-copyright.	2014-01-01 07:43:34 +00:00