diff options
| author | Chong Yidong <cyd@gnu.org> | 2011-12-17 15:50:08 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2011-12-17 15:50:08 +0800 |
| commit | 9cff91f800cc72f8c77cf192c119c78d4a14a8ee (patch) | |
| tree | 5f023ede7134cbcb1a1b69efe38750dcb6c80134 /lisp | |
| parent | 301b181a14b0f698c6aae05522e6f3401ea45a3c (diff) | |
More updates for VC documentation.
* doc/emacs/maintaining.texi (VCS Concepts): Make "revision" terminology
less CVS-specific.
(VC With A Merging VCS, VC With A Locking VCS): Add xref to
Registering node.
(Secondary VC Commands): Deleted. Promote subnodes.
(Log Buffer): Add command name for C-c C-c. Fix the name of the
log buffer. Add index entries.
(VCS Changesets, Types of Log File, VC With A Merging VCS): Use
"commit" terminology.
(Old Revisions): Move it to just before VC Change Log. "Tag" here
doesn't refer to tags tables. Note other possible forms of the
revision ID. C-x v = does not save.
(Registering): Note similarity to C-x v v action. Fix description
of how backends are chosen. De-document vc-default-init-revision.
(VC Change Log): Document C-x v l in VC-Dir buffer. Document RET
in root log buffers.
* lisp/vc/vc.el (vc-deduce-fileset): Minor doc fix.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index eb7be329d84..990a7259bc8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,7 @@ -2011-12-16 Chong Yidong <cyd@gnu.org> +2011-12-17 Chong Yidong <cyd@gnu.org> * vc/vc.el (vc-next-action): Doc fix; remove CVS-isms. + (vc-deduce-fileset): Doc fix. 2011-12-16 Andreas Schwab <schwab@linux-m68k.org> diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 85fbd93e9c6..87e8901e33a 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -951,13 +951,13 @@ Within directories, only files already under version control are noticed." (defun vc-deduce-fileset (&optional observer allow-unregistered state-model-only-files) "Deduce a set of files and a backend to which to apply an operation. - Return (BACKEND FILESET FILESET-ONLY-FILES STATE CHECKOUT-MODEL). -If we're in VC-dir mode, the fileset is the list of marked files. -Otherwise, if we're looking at a buffer visiting a version-controlled file, -the fileset is a singleton containing this file. -If none of these conditions is met, but ALLOW_UNREGISTERED is on and the -visited file is not registered, return a singleton fileset containing it. + +If we're in VC-dir mode, FILESET is the list of marked files. +Otherwise, if in a buffer visiting a version-controlled file, +FILESET is a single-file fileset containing that file. +Otherwise, if ALLOW-UNREGISTERED is non-nil and the visited file +is unregistered, FILESET is a single-file fileset containing it. Otherwise, throw an error. STATE-MODEL-ONLY-FILES if non-nil, means that the caller needs |