emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111003: lisp/vc/vc-hooks.el (vc-s


From: Juanma Barranquero
Subject: [Emacs-diffs] /srv/bzr/emacs/emacs-24 r111003: lisp/vc/vc-hooks.el (vc-state): Doc fix.
Date: Fri, 07 Dec 2012 04:55:40 +0100
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 111003
committer: Juanma Barranquero <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-12-07 04:55:40 +0100
message:
  lisp/vc/vc-hooks.el (vc-state): Doc fix.
modified:
  lisp/ChangeLog
  lisp/vc/vc-hooks.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-06 21:41:32 +0000
+++ b/lisp/ChangeLog    2012-12-07 03:55:40 +0000
@@ -1,3 +1,7 @@
+2012-12-07  Juanma Barranquero  <address@hidden>
+
+       * vc/vc-hooks.el (vc-state): Doc fix.
+
 2012-12-06  Glenn Morris  <address@hidden>
 
        * mail/rmail.el (rmail-maybe-display-summary):

=== modified file 'lisp/vc/vc-hooks.el'
--- a/lisp/vc/vc-hooks.el       2012-11-26 23:50:12 +0000
+++ b/lisp/vc/vc-hooks.el       2012-12-07 03:55:40 +0000
@@ -438,8 +438,8 @@
 (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 @@
                      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.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]