From bf741d337c02852c06be4e8b995304b9df407839 Mon Sep 17 00:00:00 2001
From: Juanma Barranquero <lekktu@gmail.com>
Date: Fri, 7 Dec 2012 04:55:40 +0100
Subject: [PATCH] lisp/vc/vc-hooks.el (vc-state): Doc fix.
---
lisp/ChangeLog | 4 ++++
lisp/vc/vc-hooks.el | 8 +++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2626c14c593..17d339c4d78 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-07 Juanma Barranquero <lekktu@gmail.com>
+
+ * vc/vc-hooks.el (vc-state): Doc fix.
+
2012-12-06 Glenn Morris <rgm@gnu.org>
* mail/rmail.el (rmail-maybe-display-summary):
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index ef900cb5257..58de1c99368 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -438,8 +438,8 @@ For registered files, the possible values are:
(defun vc-state (file &optional backend)
"Return the version control state of FILE.
-If FILE is not registered, this function always returns nil.
-For registered files, the value returned is one of:
+A return of nil from this function means we have no information on the
+status of this file. Otherwise, the value returned is one of:
'up-to-date The working file is unmodified with respect to the
latest version on the current branch, and not locked.
@@ -491,10 +491,8 @@ For registered files, the value returned is one of:
that any file with vc-state nil might be ignorable
without VC knowing it.
- 'unregistered The file is not under version control.
+ 'unregistered The file is not under version control."
-A return of nil from this function means we have no information on the
-status of this file."
;; Note: in Emacs 22 and older, return of nil meant the file was
;; unregistered. This is potentially a source of
;; backward-compatibility bugs.
--
2.39.5