diff options
| author | Glenn Morris | 2008-11-30 01:45:29 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-11-30 01:45:29 +0000 |
| commit | 39ba78efad9df5a46a40f7c28d943f2fe7ab12ae (patch) | |
| tree | 02bedfdfff97ee43b7e27100faa2f960735b0c14 | |
| parent | 0334426971911144fbd3b1b4ef750082883ca5dc (diff) | |
| download | emacs-39ba78efad9df5a46a40f7c28d943f2fe7ab12ae.tar.gz emacs-39ba78efad9df5a46a40f7c28d943f2fe7ab12ae.zip | |
(vc-mtn-diff): No need to duplicate vc-switches logic.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc-mtn.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 12e27d97c88..15bf417b4ba 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2008-11-30 Glenn Morris <rgm@gnu.org> | 1 | 2008-11-30 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * vc-git.el (vc-git-diff): | ||
| 4 | * vc-hg.el (vc-hg-diff): | ||
| 5 | * vc-mtn.el (vc-mtn-diff): No need to duplicate vc-switches logic. | ||
| 6 | |||
| 3 | * eshell/esh-proc.el (eshell-needs-pipe): New variable. | 7 | * eshell/esh-proc.el (eshell-needs-pipe): New variable. |
| 4 | (eshell-needs-pipe-p): New function. | 8 | (eshell-needs-pipe-p): New function. |
| 5 | (eshell-gather-process-output): Set process-connection-type according to | 9 | (eshell-gather-process-output): Set process-connection-type according to |
diff --git a/lisp/vc-mtn.el b/lisp/vc-mtn.el index f5fffb7fc87..e4d7535ff6a 100644 --- a/lisp/vc-mtn.el +++ b/lisp/vc-mtn.el | |||
| @@ -205,7 +205,7 @@ If you want to force an empty list of arguments, use t." | |||
| 205 | "Get a difference report using monotone between two revisions of FILES." | 205 | "Get a difference report using monotone between two revisions of FILES." |
| 206 | (apply 'vc-mtn-command (or buffer "*vc-diff*") 1 files "diff" | 206 | (apply 'vc-mtn-command (or buffer "*vc-diff*") 1 files "diff" |
| 207 | (append | 207 | (append |
| 208 | (vc-switches (if vc-mtn-diff-switches 'mtn) 'diff) | 208 | (vc-switches 'mtn 'diff) |
| 209 | (if rev1 (list "-r" rev1)) (if rev2 (list "-r" rev2))))) | 209 | (if rev1 (list "-r" rev1)) (if rev2 (list "-r" rev2))))) |
| 210 | 210 | ||
| 211 | (defun vc-mtn-annotate-command (file buf &optional rev) | 211 | (defun vc-mtn-annotate-command (file buf &optional rev) |