Mercurial > emacs
changeset 44462:6eb10924e77f
(vc-cvs-valid-version-number-p): New function.
(vc-cvs-checkin): Use it.
author | Sam Steingold <sds@gnu.org> |
---|---|
date | Tue, 09 Apr 2002 17:13:51 +0000 |
parents | 91b326cb58d1 |
children | b0c9dc55963f |
files | lisp/ChangeLog lisp/vc-cvs.el |
diffstat | 2 files changed, 14 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Apr 09 12:27:17 2002 +0000 +++ b/lisp/ChangeLog Tue Apr 09 17:13:51 2002 +0000 @@ -43,14 +43,19 @@ * international/mule-cmds.el (reset-language-environment): Handle coding-systems not being defined yet. -2002-04-07 Sam Steingold <sds@gnu.org> - - * vc-cvs.el (vc-cvs-checkin): Pass the required argument to `error'. +2002-04-08 Sam Steingold <sds@gnu.org> + + * vc-cvs.el (vc-cvs-valid-version-number-p): New function. + (vc-cvs-checkin): Use it. 2002-04-08 Pavel Jan,Bm(Bk <Pavel@Janik.cz> * files.el (display-time-string): Fix last change. +2002-04-07 Sam Steingold <sds@gnu.org> + + * vc-cvs.el (vc-cvs-checkin): Pass the required argument to `error'. + 2002-04-07 Jason Rumney <jasonr@gnu.org> * international/mule-cmds.el (set-default-coding-systems)
--- a/lisp/vc-cvs.el Tue Apr 09 12:27:17 2002 +0000 +++ b/lisp/vc-cvs.el Tue Apr 09 17:13:51 2002 +0000 @@ -5,7 +5,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel <spiegel@gnu.org> -;; $Id: vc-cvs.el,v 1.38 2002/03/28 14:27:30 spiegel Exp $ +;; $Id: vc-cvs.el,v 1.39 2002/04/08 13:38:48 sds Exp $ ;; This file is part of GNU Emacs. @@ -322,7 +322,7 @@ (list vc-checkin-switches) vc-checkin-switches)) status) - (if (not rev) + (if (or (not rev) (vc-cvs-valid-version-number-p rev)) (setq status (apply 'vc-cvs-command nil 1 file "ci" (if rev (concat "-r" rev)) (concat "-m" comment) @@ -816,6 +816,10 @@ (and (string-match "^[a-zA-Z]" tag) (not (string-match "[^a-z0-9A-Z-_]" tag)))) +(defun vc-cvs-valid-version-number-p (tag) + "Return non-nil if TAG is a valid version number." + (and (string-match "^[0-9]" tag) + (not (string-match "[^0-9.]" tag)))) (defun vc-cvs-parse-sticky-tag (match-type match-tag) "Parse and return the sticky tag as a string.