diff options
| author | Joakim Verona | 2015-02-08 21:55:28 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-02-08 21:55:28 +0100 |
| commit | 5e1d5ef39ca0d2fbff26d659f2ec6ce863b14529 (patch) | |
| tree | 860e0d53399626aee6249ebb5f972879f403b228 /lisp/vc | |
| parent | 148262ce3db990ed16989341345e232570b3a338 (diff) | |
| parent | 7d631aa0ffab875e4979727f632703ad5b4100a2 (diff) | |
| download | emacs-xwidget.tar.gz emacs-xwidget.zip | |
merge masterxwidget
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/vc-cvs.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index d803c16d7cf..707090a10eb 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el | |||
| @@ -1076,7 +1076,7 @@ Query all files in DIR if files is nil." | |||
| 1076 | (if (and (not files) local (not (eq local 'only-file))) | 1076 | (if (and (not files) local (not (eq local 'only-file))) |
| 1077 | (vc-cvs-dir-status-heuristic dir update-function) | 1077 | (vc-cvs-dir-status-heuristic dir update-function) |
| 1078 | (if (not files) (setq files (vc-expand-dirs (list dir) 'CVS))) | 1078 | (if (not files) (setq files (vc-expand-dirs (list dir) 'CVS))) |
| 1079 | (vc-cvs-command (current-buffer) 'async dir "-f" "status" files) | 1079 | (vc-cvs-command (current-buffer) 'async files "-f" "status") |
| 1080 | ;; Alternative implementation: use the "update" command instead of | 1080 | ;; Alternative implementation: use the "update" command instead of |
| 1081 | ;; the "status" command. | 1081 | ;; the "status" command. |
| 1082 | ;; (vc-cvs-command (current-buffer) 'async | 1082 | ;; (vc-cvs-command (current-buffer) 'async |