diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2014-12-14 12:49:08 +0200 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2014-12-14 12:49:08 +0200 |
| commit | 01b97f9df2d94e1e1c31517e084bf8d76174e1d4 (patch) | |
| tree | 5a2c04ab23b497e86b452d2ee5f903196bb9940f /lisp/vc/vc.el | |
| parent | f8f73570a89975fabb587b490b3ccb6a40e8aee1 (diff) | |
| download | emacs-01b97f9df2d94e1e1c31517e084bf8d76174e1d4.tar.gz emacs-01b97f9df2d94e1e1c31517e084bf8d76174e1d4.tar.bz2 emacs-01b97f9df2d94e1e1c31517e084bf8d76174e1d4.zip | |
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.el')
| -rw-r--r-- | lisp/vc/vc.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index b8be3ff7df2..954b3cfeb02 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -362,10 +362,10 @@ ;; default implementation runs rcs2log, which handles RCS- and ;; CVS-style logs. ;; -;; * diff (files &optional async rev1 rev2 buffer) +;; * diff (files &optional rev1 rev2 buffer async) ;; ;; Insert the diff for FILE into BUFFER, or the *vc-diff* buffer if -;; BUFFER is nil. If ASYNC is non-nil, run asynchronously.If REV1 +;; BUFFER is nil. If ASYNC is non-nil, run asynchronously. If REV1 ;; and REV2 are non-nil, report differences from REV1 to REV2. If ;; REV1 is nil, use the working revision (as found in the ;; repository) as the older revision; if REV2 is nil, use the @@ -552,7 +552,7 @@ ;; revision been even possible, let alone sane. ;; ;; INCOMPATIBLE CHANGE: In older versions of the API, vc-diff did -;; not take an async-mode flag as a first optional argument. (This +;; not take an async-mode flag as a fourth optional argument. (This ;; change eliminated a particularly ugly global.) ;; ;; - INCOMPATIBLE CHANGE: The backend operation for non-distributed @@ -1691,7 +1691,7 @@ Return t if the buffer had changes, nil otherwise." (if async 'async 1) "diff" file (append (vc-switches nil 'diff) '("/dev/null")))))) (setq files (nreverse filtered)))) - (vc-call-backend (car vc-fileset) 'diff files async rev1 rev2 buffer) + (vc-call-backend (car vc-fileset) 'diff files rev1 rev2 buffer async) (set-buffer buffer) (diff-mode) (set (make-local-variable 'diff-vc-backend) (car vc-fileset)) |