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-hg.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-hg.el')
| -rw-r--r-- | lisp/vc/vc-hg.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 92b0c3169c1..dd897adc59c 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -335,7 +335,7 @@ If LIMIT is non-nil, show no more than this many entries." (autoload 'vc-switches "vc") -(defun vc-hg-diff (files &optional oldvers newvers buffer async) +(defun vc-hg-diff (files &optional oldvers newvers buffer _async) "Get a difference report using hg between two revisions of FILES." (let* ((firstfile (car files)) (working (and firstfile (vc-working-revision firstfile)))) @@ -345,8 +345,8 @@ If LIMIT is non-nil, show no more than this many entries." (setq oldvers working)) (apply #'vc-hg-command (or buffer "*vc-diff*") - (if async 'async nil) - files "diff" + nil ; bug#21969 + files "diff" (append (vc-switches 'hg 'diff) (when oldvers |