emacs/lisp/vc, branch xwidget

(vc-cvs-dir-status-files): Don't pass DIR to `vc-cvs-command'

2015-02-06T23:35:24+00:00

Fixes: debbugs:19732

* lisp/vc/vc-cvs.el (vc-cvs-dir-status-files): Don't pass DIR to
`vc-cvs-command'.

Make vc-dir default to repository root

2015-01-20T05:45:25+00:00

* lisp/vc/vc-dir.el (vc-dir): Default to repository root, not
default-directory.

Fix mistake in rebase/merge conflict resolution.

2015-01-17T23:06:13+00:00

Remove lines from lisp/vc/vc-bzr.el again that were accidentally
restored in commit 2015-01-17T09:56:45!ulm@gentoo.org.
(Previously removed in commit 2014-12-01T13:24:27Z!esr@thyrsus.com.)

Discard the Bazaar case in repository version detection

2015-01-17T09:56:45+00:00

* version.el (emacs-bzr-version-dirstate, emacs-bzr-version-bzr):
Remove.
(emacs-repository-get-version): Discard the Bazaar case.

* vc/vc-bzr.el (vc-bzr-version-dirstate): Rename from
emacs-bzr-version-dirstate and move from version.el to here.
(vc-bzr-working-revision): Use it.

vc-svn-dir-status-files: Parse output with the remote format

2015-01-16T03:24:09+00:00

Fixes: debbugs:19429

* lisp/vc/vc-svn.el (vc-svn-dir-status-files): Pass t as
vc-svn-after-dir-status's second argument.

Better binding for vc-delete-file

2015-01-10T06:44:31+00:00

* lisp/vc/vc-hooks.el (vc-prefix-map): Bind vc-delete-file to C-x v x,
by analogy with dired.

Update copyright year to 2015

2015-01-01T22:26:41+00:00

Run admin/update-copyright.

* lisp/vc/vc-dir.el (vc-dir-display-file): New command.

2014-12-29T00:47:05+00:00

(vc-dir-mode-map): Bind it to "\C-o".
(vc-dir-menu-map): Add it to menu.

Fixes: debbugs:19450

Use diff faces for compare-windows

2014-12-28T00:48:05+00:00

* lisp/vc/compare-w.el: Require diff-mode for diff faces.
(compare-windows-removed, compare-windows-added): New faces
inheriting from diff faces.
(compare-windows): Define obsolete face alias.
(compare-windows-highlight): Replace face `compare-windows' with
new faces `compare-windows-added' and `compare-windows-removed'.
(compare-windows-get-recent-window): Signal an error when
no other window is found.

Fixes: debbugs:19451

Merge from origin/emacs-24

2014-12-27T16:15:55+00:00

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