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
..
add-log.el
compare-w.el	Compare with the most recently used window by default.	2014-12-05 02:50:41 +02:00
cvs-status.el
diff-mode.el	* lisp/vc/diff-mode.el (diff-kill-applied-hunks): New command.	2014-12-01 13:16:53 -05:00
diff.el
ediff-diff.el
ediff-help.el
ediff-hook.el
ediff-init.el	* lisp: Prefer inlinable functions to macros.	2014-12-05 12:49:53 -05:00
ediff-merg.el
ediff-mult.el
ediff-ptch.el
ediff-util.el
ediff-vers.el
ediff-wind.el
ediff.el
emerge.el
log-edit.el
log-view.el
pcvs-defs.el
pcvs-info.el
pcvs-parse.el
pcvs-util.el
pcvs.el
smerge-mode.el	* lisp/vc/diff-mode.el (diff-kill-applied-hunks): New command.	2014-12-01 13:16:53 -05:00
vc-annotate.el
vc-bzr.el	Move VC diff ASYNC argument to the fifth position	2014-12-14 12:49:08 +02:00
vc-cvs.el	Move VC diff ASYNC argument to the fifth position	2014-12-14 12:49:08 +02:00
vc-dav.el	Move VC diff ASYNC argument to the fifth position	2014-12-14 12:49:08 +02:00
vc-dir.el	Spelling fixes	2014-12-12 18:42:57 -08:00
vc-dispatcher.el	Righteous featurectomy of vc-keep-workfiles - always do it.	2014-12-10 12:33:26 -05:00
vc-filewise.el	Renove duplicate code.	2014-12-01 07:39:15 -05:00
vc-git.el	Merge from origin/emacs-24	2014-12-27 13:15:55 -03:00
vc-hg.el	Move VC diff ASYNC argument to the fifth position	2014-12-14 12:49:08 +02:00
vc-hooks.el	Remove VC rollback method.	2014-12-11 22:44:32 -05:00
vc-mtn.el	Move VC diff ASYNC argument to the fifth position	2014-12-14 12:49:08 +02:00
vc-rcs.el	Move VC diff ASYNC argument to the fifth position	2014-12-14 12:49:08 +02:00
vc-sccs.el	Move VC diff ASYNC argument to the fifth position	2014-12-14 12:49:08 +02:00
vc-src.el	Move VC diff ASYNC argument to the fifth position	2014-12-14 12:49:08 +02:00
vc-svn.el	Remove extra semicolons	2014-12-18 15:51:34 +02:00
vc.el	* lisp/vc/vc.el: Improve `dir-status-files' description	2014-12-17 06:34:11 +02:00