diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
| commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/vc/vc-mtn.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-25-merge.tar.gz | |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/vc/vc-mtn.el')
| -rw-r--r-- | lisp/vc/vc-mtn.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index b56a08f2a9e..3b59c61eb78 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el @@ -253,10 +253,10 @@ If LIMIT is non-nil, show no more than this many entries." (autoload 'vc-switches "vc") -(defun vc-mtn-diff (files &optional rev1 rev2 buffer async) +(defun vc-mtn-diff (files &optional rev1 rev2 buffer _async) "Get a difference report using monotone between two revisions of FILES." (apply 'vc-mtn-command (or buffer "*vc-diff*") - (if async 'async 1) + 1 ; bug#21969 files "diff" (append (vc-switches 'mtn 'diff) |