diff options
| author | Juanma Barranquero | 2012-12-07 04:55:40 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2012-12-07 04:55:40 +0100 |
| commit | bf741d337c02852c06be4e8b995304b9df407839 (patch) | |
| tree | 903ef7dcf9b5861c890410a6a72e57b1992a7fe9 | |
| parent | 070261664710ac7af1c49b6a97ecfed2f17c9431 (diff) | |
| download | emacs-bf741d337c02852c06be4e8b995304b9df407839.tar.gz emacs-bf741d337c02852c06be4e8b995304b9df407839.zip | |
lisp/vc/vc-hooks.el (vc-state): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2012-12-07 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * vc/vc-hooks.el (vc-state): Doc fix. | ||
| 4 | |||
| 1 | 2012-12-06 Glenn Morris <rgm@gnu.org> | 5 | 2012-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 | ||
| 441 | If FILE is not registered, this function always returns nil. | 441 | A return of nil from this function means we have no information on the |
| 442 | For registered files, the value returned is one of: | 442 | status 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 | ||
| 496 | A return of nil from this function means we have no information on the | ||
| 497 | status 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. |