]> code.delx.au - gnu-emacs/commit
Merge from origin/emacs-24
authorFabián Ezequiel Gallina <fgallina@gnu.org>
Sat, 27 Dec 2014 16:15:55 +0000 (13:15 -0300)
committerFabián Ezequiel Gallina <fgallina@gnu.org>
Sat, 27 Dec 2014 16:15:55 +0000 (13:15 -0300)
commit3a12f2ed99734eff668f83f630c7108000e0b399
treed00367f58fbe82773b1f45771df827d22f83d939
parent6d14e0d361cfb3589874fe1b559e30b4fd3eb284
parent2616307f5c517124715b4d20bdd23c6c70366ac9
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
13 files changed:
.gitignore
ChangeLog
lisp/ChangeLog
lisp/net/tramp-sh.el
lisp/net/tramp.el
lisp/subr.el
lisp/textmodes/tex-mode.el
lisp/vc/vc-git.el
src/ChangeLog
src/buffer.c
src/gnutls.c
test/ChangeLog
test/automated/data/flymake/test.pl