diff options
| author | Joakim Verona | 2012-01-23 15:10:06 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-01-23 15:10:06 +0100 |
| commit | 0322b140eead7c94de7f0f6d19a90bd15690b4eb (patch) | |
| tree | 950c011783cc896d0450084cb5155e54548bfe5b /lisp/vc | |
| parent | d5114bfea3ea4c37c57e2af0f3b095be9fcd8bac (diff) | |
| parent | cb5850f27c1b4d26957d58e2da2314dd12498671 (diff) | |
| download | emacs-0322b140eead7c94de7f0f6d19a90bd15690b4eb.tar.gz emacs-0322b140eead7c94de7f0f6d19a90bd15690b4eb.zip | |
upstream
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/pcvs.el | 16 | ||||
| -rw-r--r-- | lisp/vc/vc-dav.el | 5 |
2 files changed, 9 insertions, 12 deletions
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el index 1066ebc7f81..9ba65cda143 100644 --- a/lisp/vc/pcvs.el +++ b/lisp/vc/pcvs.el | |||
| @@ -31,19 +31,19 @@ | |||
| 31 | 31 | ||
| 32 | ;;; Commentary: | 32 | ;;; Commentary: |
| 33 | 33 | ||
| 34 | ;; PCL-CVS is a front-end to the CVS version control system. For people | 34 | ;; PCL-CVS is a front-end to the CVS version control system. |
| 35 | ;; familiar with VC, it is somewhat like VC-dired: it presents the status of | 35 | ;; It presents the status of all the files in your working area and |
| 36 | ;; all the files in your working area and allows you to commit/update several | 36 | ;; allows you to commit/update several of them at a time. |
| 37 | ;; of them at a time. Compared to VC-dired, it is considerably better and | 37 | ;; Compare with the general Emacs utility vc-dir, which tries |
| 38 | ;; faster (but only for CVS). | 38 | ;; to be VCS-agnostic. You may find PCL-CVS better/faster for CVS. |
| 39 | 39 | ||
| 40 | ;; PCL-CVS was originally written by Per Cederqvist many years ago. This | 40 | ;; PCL-CVS was originally written by Per Cederqvist many years ago. This |
| 41 | ;; version derives from the XEmacs-21 version, itself based on the 2.0b2 | 41 | ;; version derives from the XEmacs-21 version, itself based on the 2.0b2 |
| 42 | ;; version (last release from Per). It is a thorough rework. | 42 | ;; version (last release from Per). It is a thorough rework. |
| 43 | 43 | ||
| 44 | ;; Contrary to what you'd expect, PCL-CVS is not a replacement for VC but only | 44 | ;; PCL-CVS is not a replacement for VC, but adds extra functionality. |
| 45 | ;; for VC-dired. As such, I've tried to make PCL-CVS and VC interoperate | 45 | ;; As such, I've tried to make PCL-CVS and VC interoperate seamlessly |
| 46 | ;; seamlessly (I also use VC). | 46 | ;; (I also use VC). |
| 47 | 47 | ||
| 48 | ;; To use PCL-CVS just use `M-x cvs-examine RET <dir> RET'. | 48 | ;; To use PCL-CVS just use `M-x cvs-examine RET <dir> RET'. |
| 49 | ;; There is a TeXinfo manual, which can be helpful to get started. | 49 | ;; There is a TeXinfo manual, which can be helpful to get started. |
diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el index 6f9a6d6b7df..9d55e9c7b43 100644 --- a/lisp/vc/vc-dav.el +++ b/lisp/vc/vc-dav.el | |||
| @@ -170,10 +170,7 @@ It should return a status of either 0 (no differences found), or | |||
| 170 | ;; Return a dav-specific mode line string for URL. Are there any | 170 | ;; Return a dav-specific mode line string for URL. Are there any |
| 171 | ;; specific states that we want exposed? | 171 | ;; specific states that we want exposed? |
| 172 | ;; | 172 | ;; |
| 173 | ;; vc-dav-dired-state-info(url) | 173 | ;; vc-dir support |
| 174 | ;; Translate the `vc-state' property of URL into a string that can | ||
| 175 | ;; be used in a vc-dired buffer. Are there any extra states that | ||
| 176 | ;; we want exposed? | ||
| 177 | ;; | 174 | ;; |
| 178 | ;; vc-dav-receive-file(url rev) | 175 | ;; vc-dav-receive-file(url rev) |
| 179 | ;; Let this backend `receive' a file that is already registered | 176 | ;; Let this backend `receive' a file that is already registered |