diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2015-11-22 06:59:50 +0200 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2015-11-22 07:00:31 +0200 |
| commit | 2a4362ba622a53683e9c6ea3e1b441d6f59af08f (patch) | |
| tree | 0e332aaa9034acf5491c4436006c46e3f2321538 /lisp/vc/vc-mtn.el | |
| parent | 8726de6663608b74e81ff88e530b4ddc6165700f (diff) | |
| download | emacs-2a4362ba622a53683e9c6ea3e1b441d6f59af08f.tar.gz | |
Work around the asynchronous-empty-diff problem
* 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): Ignore the ASYNC argument,
do a synchronous process call (bug#21969).
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) |