diff options
| author | Richard M. Stallman | 1999-01-02 21:54:32 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1999-01-02 21:54:32 +0000 |
| commit | ac3db2e4296a81d1143184982b1da446dff2c12f (patch) | |
| tree | 43dad31c239685f4019cc50ad194b9a196dba588 | |
| parent | 0f5c40c7b04348aa5c95a2716b0c90f8c74d8814 (diff) | |
| download | emacs-ac3db2e4296a81d1143184982b1da446dff2c12f.tar.gz emacs-ac3db2e4296a81d1143184982b1da446dff2c12f.zip | |
(vc-backend-diff): Use `diff-switches-list' throughout.
| -rw-r--r-- | lisp/vc.el | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 39c84adbf82..78cfcf5e8ff 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> | 5 | ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> |
| 6 | ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> | 6 | ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> |
| 7 | 7 | ||
| 8 | ;; $Id: vc.el,v 1.240 1998/12/02 13:34:59 spiegel Exp rost $ | 8 | ;; $Id: vc.el,v 1.241 1998/12/08 16:04:52 rost Exp rms $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -2939,17 +2939,13 @@ THRESHOLD, nil otherwise" | |||
| 2939 | ;; diff it against /dev/null. | 2939 | ;; diff it against /dev/null. |
| 2940 | (apply 'vc-do-command | 2940 | (apply 'vc-do-command |
| 2941 | "*vc-diff*" 1 "diff" file 'WORKFILE | 2941 | "*vc-diff*" 1 "diff" file 'WORKFILE |
| 2942 | (append (if (listp diff-switches) | 2942 | (append diff-switches-list '("/dev/null"))))) |
| 2943 | diff-switches | ||
| 2944 | (list diff-switches)) '("/dev/null"))))) | ||
| 2945 | ;; cmp is not yet implemented -- we always do a full diff. | 2943 | ;; cmp is not yet implemented -- we always do a full diff. |
| 2946 | (apply 'vc-do-command | 2944 | (apply 'vc-do-command |
| 2947 | "*vc-diff*" 1 "cvs" file 'WORKFILE "diff" | 2945 | "*vc-diff*" 1 "cvs" file 'WORKFILE "diff" |
| 2948 | (and oldvers (concat "-r" oldvers)) | 2946 | (and oldvers (concat "-r" oldvers)) |
| 2949 | (and newvers (concat "-r" newvers)) | 2947 | (and newvers (concat "-r" newvers)) |
| 2950 | (if (listp diff-switches) | 2948 | diff-switches-list)))))) |
| 2951 | diff-switches | ||
| 2952 | (list diff-switches)))))))) | ||
| 2953 | 2949 | ||
| 2954 | (defun vc-backend-merge-news (file) | 2950 | (defun vc-backend-merge-news (file) |
| 2955 | ;; Merge in any new changes made to FILE. | 2951 | ;; Merge in any new changes made to FILE. |