diff options
| author | Dan Nicolaescu | 2007-07-20 17:32:04 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2007-07-20 17:32:04 +0000 |
| commit | d7927b9f487e83cffbb1e051d7b0f2b1f2a4b985 (patch) | |
| tree | 128e0847237cb93cf7614d3230ae12590102707b | |
| parent | 3f0257cb934a3ac7aa7310a6adccc064219623b1 (diff) | |
| download | emacs-d7927b9f487e83cffbb1e051d7b0f2b1f2a4b985.tar.gz emacs-d7927b9f487e83cffbb1e051d7b0f2b1f2a4b985.zip | |
(vc-hg-diff): Use vc-hg-command.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3a7a6c25758..c7f71d5cfc5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-07-20 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * vc-hg.el (vc-hg-diff): Use vc-hg-command. | ||
| 4 | |||
| 1 | 2007-07-20 Vinicius Jose Latorre <viniciusjl@ig.com.br> | 5 | 2007-07-20 Vinicius Jose Latorre <viniciusjl@ig.com.br> |
| 2 | 6 | ||
| 3 | * ps-print.el: Problem with foreground and background color when | 7 | * ps-print.el: Problem with foreground and background color when |
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index 596e95a70b2..21ce5c38f41 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el | |||
| @@ -282,15 +282,16 @@ | |||
| 282 | (setq oldvers nil)) | 282 | (setq oldvers nil)) |
| 283 | (if (and (not oldvers) newvers) | 283 | (if (and (not oldvers) newvers) |
| 284 | (setq oldvers working)) | 284 | (setq oldvers working)) |
| 285 | (apply 'call-process "hg" nil (or buffer "*vc-diff*") nil | 285 | (apply #'vc-hg-command (or buffer "*vc-diff*") nil |
| 286 | "--cwd" (file-name-directory (car files)) "diff" | 286 | (mapcar (lambda (file) (file-name-nondirectory file)) files) |
| 287 | "--cwd" (file-name-directory (car files)) | ||
| 288 | "diff" | ||
| 287 | (append | 289 | (append |
| 288 | (if oldvers | 290 | (if oldvers |
| 289 | (if newvers | 291 | (if newvers |
| 290 | (list "-r" oldvers "-r" newvers) | 292 | (list "-r" oldvers "-r" newvers) |
| 291 | (list "-r" oldvers)) | 293 | (list "-r" oldvers)) |
| 292 | (list "")) | 294 | (list "")))))) |
| 293 | (mapcar (lambda (file) (file-name-nondirectory file)) files))))) | ||
| 294 | 295 | ||
| 295 | (defun vc-hg-diff-tree (file &optional oldvers newvers buffer) | 296 | (defun vc-hg-diff-tree (file &optional oldvers newvers buffer) |
| 296 | (vc-hg-diff (list file) oldvers newvers buffer)) | 297 | (vc-hg-diff (list file) oldvers newvers buffer)) |