merge from trunk

2 files changed, 4 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6d7a87f0915..37f63216ff6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-09-12  Glenn Morris  <rgm@gnu.org>
 
+        * vc/vc.el (vc-deduce-fileset): Doc fix.
+
         * calc/calc-help.el (Info-goto-node):
         * progmodes/cperl-mode.el (Info-find-node):
         * vc/ediff.el (Info-goto-node): Update declarations.
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 39e3fbdc29a..fa5c87d44e3 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -965,7 +965,8 @@ Within directories, only files already under version control are noticed."
   "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, FILESET is the list of marked files.
+If we're in VC-dir mode, FILESET is the list of marked files,
+or the directory if no files are marked.
 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