diff options
Diffstat (limited to 'contrib/cvs/tools/pcl-cvs')
| -rw-r--r-- | contrib/cvs/tools/pcl-cvs/ChangeLog | 5 | ||||
| -rw-r--r-- | contrib/cvs/tools/pcl-cvs/INSTALL | 2 | ||||
| -rw-r--r-- | contrib/cvs/tools/pcl-cvs/ToDo | 2 | ||||
| -rw-r--r-- | contrib/cvs/tools/pcl-cvs/pcl-cvs.el | 14 |
4 files changed, 17 insertions, 6 deletions
diff --git a/contrib/cvs/tools/pcl-cvs/ChangeLog b/contrib/cvs/tools/pcl-cvs/ChangeLog index a9e6f47..7a4b2c3 100644 --- a/contrib/cvs/tools/pcl-cvs/ChangeLog +++ b/contrib/cvs/tools/pcl-cvs/ChangeLog @@ -1,3 +1,8 @@ +1998-01-03 Jim Blandy <jimb@totoro.red-bean.com> + + * (cvs-changelog-ours-p): Recognize Emacs 20-style ChangeLog + entries. + Mon Oct 14 19:19:17 1996 Jim Blandy <jimb@totoro.cyclic.com> * pcl-cvs.el (cvs-parse-stderr): Ignore messages about patch hunks diff --git a/contrib/cvs/tools/pcl-cvs/INSTALL b/contrib/cvs/tools/pcl-cvs/INSTALL index c4cf8dc..56ff80d 100644 --- a/contrib/cvs/tools/pcl-cvs/INSTALL +++ b/contrib/cvs/tools/pcl-cvs/INSTALL @@ -91,4 +91,4 @@ from `pcl-cvs.texinfo'. -- -#ident "@(#)cvs/contrib/pcl-cvs:$Name: $Id: INSTALL,v 1.2 1996/04/15 06:33:16 kfogel Exp $" +#ident "@(#)cvs/contrib/pcl-cvs:$Name: $Id$" diff --git a/contrib/cvs/tools/pcl-cvs/ToDo b/contrib/cvs/tools/pcl-cvs/ToDo index 04eb557..8e317f8 100644 --- a/contrib/cvs/tools/pcl-cvs/ToDo +++ b/contrib/cvs/tools/pcl-cvs/ToDo @@ -41,4 +41,4 @@ help generate full releases) files -- -#ident "@(#)cvs/contrib/pcl-cvs:$Name: $Id$" +#ident "@(#)cvs/contrib/pcl-cvs:$Name: $Id: ToDo,v 1.1 1996/04/14 15:17:57 kfogel Exp $" diff --git a/contrib/cvs/tools/pcl-cvs/pcl-cvs.el b/contrib/cvs/tools/pcl-cvs/pcl-cvs.el index 8a13122..1dd7cae 100644 --- a/contrib/cvs/tools/pcl-cvs/pcl-cvs.el +++ b/contrib/cvs/tools/pcl-cvs/pcl-cvs.el @@ -1,7 +1,7 @@ ;;; ;;;#ident "@(#)OrigId: pcl-cvs.el,v 1.93 1993/05/31 22:44:00 ceder Exp " ;;; -;;;#ident "@(#)cvs/contrib/pcl-cvs:$Name: $:$Id: pcl-cvs.el,v 1.6 1996/11/06 17:29:31 jimb Exp $" +;;;#ident "@(#)cvs/contrib/pcl-cvs:$Name: $:$Id: pcl-cvs.el,v 1.7 1998/01/04 14:24:13 kingdon Exp $" ;;; ;;; pcl-cvs.el -- A Front-end to CVS 1.3 or later. ;;; Release 1.05-CVS-$Name: $. @@ -1014,7 +1014,7 @@ ERR-BUF should be 'STDOUT or 'STDERR." (insert "Pcl-cvs Version: " "@(#)OrigId: pcl-cvs.el,v 1.93 1993/05/31 22:44:00 ceder Exp\n") (insert "CVS Version: " - "@(#)cvs/contrib/pcl-cvs:$Name: $:$Id: pcl-cvs.el,v 1.6 1996/11/06 17:29:31 jimb Exp $\n\n") + "@(#)cvs/contrib/pcl-cvs:$Name: $:$Id: pcl-cvs.el,v 1.7 1998/01/04 14:24:13 kingdon Exp $\n\n") (insert (format "--- Contents of stdout buffer (%d chars) ---\n" (length stdout))) (insert stdout) @@ -3288,7 +3288,13 @@ for more details." "See if ChangeLog entry at point is for the current user, today. Return non-nil iff it is." ;; Code adapted from add-change-log-entry. - (looking-at (concat (regexp-quote (substring (current-time-string) + (or (looking-at + (regexp-quote (format "%s %s <%s>" + (format-time-string "%Y-%m-%d") + add-log-full-name + add-log-mailing-address))) + (looking-at + (concat (regexp-quote (substring (current-time-string) 0 10)) ".* " (regexp-quote (substring (current-time-string) -4)) @@ -3301,7 +3307,7 @@ Return non-nil iff it is." (regexp-quote (if (and (boundp 'add-log-mailing-address) add-log-mailing-address) add-log-mailing-address - user-mail-address))))) + user-mail-address)))))) (defun cvs-relative-path (base child) "Return a directory path relative to BASE for CHILD. |
