aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc/vc-hooks.el8
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 @@
12012-12-07 Juanma Barranquero <lekktu@gmail.com>
2
3 * vc/vc-hooks.el (vc-state): Doc fix.
4
12012-12-06 Glenn Morris <rgm@gnu.org> 52012-12-06 Glenn Morris <rgm@gnu.org>
2 6
3 * mail/rmail.el (rmail-maybe-display-summary): 7 * 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:
438(defun vc-state (file &optional backend) 438(defun vc-state (file &optional backend)
439 "Return the version control state of FILE. 439 "Return the version control state of FILE.
440 440
441If FILE is not registered, this function always returns nil. 441A return of nil from this function means we have no information on the
442For registered files, the value returned is one of: 442status of this file. Otherwise, the value returned is one of:
443 443
444 'up-to-date The working file is unmodified with respect to the 444 'up-to-date The working file is unmodified with respect to the
445 latest version on the current branch, and not locked. 445 latest version on the current branch, and not locked.
@@ -491,10 +491,8 @@ For registered files, the value returned is one of:
491 that any file with vc-state nil might be ignorable 491 that any file with vc-state nil might be ignorable
492 without VC knowing it. 492 without VC knowing it.
493 493
494 'unregistered The file is not under version control. 494 'unregistered The file is not under version control."
495 495
496A return of nil from this function means we have no information on the
497status of this file."
498 ;; Note: in Emacs 22 and older, return of nil meant the file was 496 ;; Note: in Emacs 22 and older, return of nil meant the file was
499 ;; unregistered. This is potentially a source of 497 ;; unregistered. This is potentially a source of
500 ;; backward-compatibility bugs. 498 ;; backward-compatibility bugs.