aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2005-12-14 20:11:11 +0000
committerRichard M. Stallman2005-12-14 20:11:11 +0000
commitc94dca60212b9586a723dd293a02553adf052b75 (patch)
treed17fef7ece3617b6d9d1da538e9d1acd9a6e708a
parent6b960c100e386735bedea22e9bdd771b54a39b23 (diff)
downloademacs-c94dca60212b9586a723dd293a02553adf052b75.tar.gz
emacs-c94dca60212b9586a723dd293a02553adf052b75.zip
(vc-default-previous-version, vc-default-next-version)
(vc-do-command): Doc fixes.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a71565c2b3..00307c84625 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12005-12-14 Richard M. Stallman <rms@gnu.org>
2
3 * vc.el (vc-default-previous-version, vc-default-next-version)
4 (vc-do-command): Doc fixes.
5
12005-12-14 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de> 62005-12-14 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
2 7
3 * textmodes/bibtex.el (bibtex-expand-strings) 8 * textmodes/bibtex.el (bibtex-expand-strings)
diff --git a/lisp/vc.el b/lisp/vc.el
index 9429ab4c646..d06e49ef1ba 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -762,7 +762,7 @@ in their implementation of vc-BACKEND-diff.")
762(defun vc-default-previous-version (backend file rev) 762(defun vc-default-previous-version (backend file rev)
763 "Return the version number immediately preceding REV for FILE, 763 "Return the version number immediately preceding REV for FILE,
764or nil if there is no previous version. This default 764or nil if there is no previous version. This default
765implementation works for <major>.<minor>-style version numbers as 765implementation works for MAJOR.MINOR-style version numbers as
766used by RCS and CVS." 766used by RCS and CVS."
767 (let ((branch (vc-branch-part rev)) 767 (let ((branch (vc-branch-part rev))
768 (minor-num (string-to-number (vc-minor-part rev)))) 768 (minor-num (string-to-number (vc-minor-part rev))))
@@ -781,7 +781,7 @@ used by RCS and CVS."
781(defun vc-default-next-version (backend file rev) 781(defun vc-default-next-version (backend file rev)
782 "Return the version number immediately following REV for FILE, 782 "Return the version number immediately following REV for FILE,
783or nil if there is no next version. This default implementation 783or nil if there is no next version. This default implementation
784works for <major>.<minor>-style version numbers as used by RCS 784works for MAJOR.MINOR-style version numbers as used by RCS
785and CVS." 785and CVS."
786 (when (not (string= rev (vc-workfile-version file))) 786 (when (not (string= rev (vc-workfile-version file)))
787 (let ((branch (vc-branch-part rev)) 787 (let ((branch (vc-branch-part rev))
@@ -930,7 +930,7 @@ Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil or the
930current buffer if BUFFER is t. If the destination buffer is not 930current buffer if BUFFER is t. If the destination buffer is not
931already current, set it up properly and erase it. The command is 931already current, set it up properly and erase it. The command is
932considered successful if its exit status does not exceed OKSTATUS (if 932considered successful if its exit status does not exceed OKSTATUS (if
933OKSTATUS is nil, that means to ignore error status, if it is 'async, that 933OKSTATUS is nil, that means to ignore error status, if it is `async', that
934means not to wait for termination of the subprocess; if it is t it means to 934means not to wait for termination of the subprocess; if it is t it means to
935ignore all execution errors). FILE is the 935ignore all execution errors). FILE is the
936name of the working file (may also be nil, to execute commands that 936name of the working file (may also be nil, to execute commands that