X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/5244bc019bf7376caff3bb198ff674e0ad9fb0e6..7e09ef09a479731d01b1ca46e94ddadd73ac98e3:/lisp/vc/pcvs-parse.el diff --git a/lisp/vc/pcvs-parse.el b/lisp/vc/pcvs-parse.el index dd448b9d48..5dcb4c55b0 100644 --- a/lisp/vc/pcvs-parse.el +++ b/lisp/vc/pcvs-parse.el @@ -1,6 +1,6 @@ ;;; pcvs-parse.el --- the CVS output parser -;; Copyright (C) 1991-2012 Free Software Foundation, Inc. +;; Copyright (C) 1991-2015 Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: pcl-cvs @@ -165,13 +165,13 @@ Match RE and if successful, execute MATCHES." TYPE can either be a type symbol or a cons of the form (TYPE . SUBTYPE). PATH is the filename. DIRECTORY influences the way PATH is interpreted: -- if it's a string, it denotes the directory in which PATH (which should then be +- if a string, it denotes the directory in which PATH (which should then be a plain file name with no directory component) resides. - if it's nil, the PATH should not be trusted: if it has a directory component, use it, else, assume it is relative to the current directory. -- else, the PATH should be trusted to be relative to the root - directory (i.e. if there is no directory component, it means the file - is inside the main directory). +- else, the PATH should be trusted to be relative to the root directory + (i.e. if there is no directory component, it means the file is inside + the main directory). The remaining KEYS are passed directly to `cvs-create-fileinfo'." (let ((dir directory) (file path))