summaryrefslogtreecommitdiff
path: root/lisp/vc/vc-git.el
diff options
context:
space:
mode:
authorDmitry Gutov <dgutov@yandex.ru>2014-12-14 12:49:08 +0200
committerDmitry Gutov <dgutov@yandex.ru>2014-12-14 12:49:08 +0200
commit01b97f9df2d94e1e1c31517e084bf8d76174e1d4 (patch)
tree5a2c04ab23b497e86b452d2ee5f903196bb9940f /lisp/vc/vc-git.el
parentf8f73570a89975fabb587b490b3ccb6a40e8aee1 (diff)
downloademacs-01b97f9df2d94e1e1c31517e084bf8d76174e1d4.tar.gz
Move VC diff ASYNC argument to the fifth position
* lisp/vc/vc-svn.el (vc-svn-diff): * lisp/vc/vc-src.el (vc-src-diff): * lisp/vc/vc-sccs.el (vc-sccs-diff): * lisp/vc/vc-rcs.el (vc-rcs-diff): * lisp/vc/vc-mtn.el (vc-mtn-diff): * lisp/vc/vc-hg.el (vc-hg-diff): * lisp/vc/vc-git.el (vc-git-diff): * lisp/vc/vc-dav.el (vc-dav-diff): * lisp/vc/vc-cvs.el (vc-cvs-diff): * lisp/vc/vc-bzr.el (vc-bzr-diff): * lisp/obsolete/vc-arch.el (vc-arch-diff): Move ASYNC argument to the end. * lisp/vc/vc.el (vc-diff-internal): Pass `async' argument to the backend `diff' command in the last position.
Diffstat (limited to 'lisp/vc/vc-git.el')
-rw-r--r--lisp/vc/vc-git.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index c41dde1b3db..65f683c7808 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -78,7 +78,7 @@
;; - show-log-entry (revision) OK
;; - comment-history (file) ??
;; - update-changelog (files) COULD BE SUPPORTED
-;; * diff (file &optional rev1 rev2 buffer) OK
+;; * diff (file &optional rev1 rev2 buffer async) OK
;; - revision-completion-table (files) OK
;; - annotate-command (file buf &optional rev) OK
;; - annotate-time () OK
@@ -977,7 +977,7 @@ or BRANCH^ (where \"^\" can be repeated)."
(autoload 'vc-switches "vc")
-(defun vc-git-diff (files &optional async rev1 rev2 buffer)
+(defun vc-git-diff (files &optional rev1 rev2 buffer async)
"Get a difference report using Git between two revisions of FILES."
(let (process-file-side-effects)
(if vc-git-diff-switches