(cvs-parse-table): Adjust regexp for resurrections.

[bpt/emacs.git] / lisp / time-stamp.el

diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index c66736a..7316e6d 100644 (file)
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -1,7 +1,7 @@
 ;;; time-stamp.el --- Maintain last change time stamps in files edited by Emacs
 
 ;; Copyright (C) 1989, 1993, 1994, 1995, 1997, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -491,7 +491,7 @@ and all `time-stamp-format' compatibility."
                 (or (eq ?. cur-char)
                     (eq ?, cur-char) (eq ?: cur-char) (eq ?@ cur-char)
                     (eq ?- cur-char) (eq ?+ cur-char) (eq ?_ cur-char)
-                    (eq ?\  cur-char) (eq ?# cur-char) (eq ?^ cur-char)
+                    (eq ?\s cur-char) (eq ?# cur-char) (eq ?^ cur-char)
                     (and (eq ?\( cur-char)
                          (not (eq prev-char ?\\))
                          (setq paren-level (1+ paren-level)))
@@ -710,23 +710,16 @@ around literals."
 ;;; Some functions used in time-stamp-format
 
 ;;; These functions have been obsolete since 1995
-;;; and will be removed in Emacs 22.
+;;; and will be removed in a future Emacs release.
 ;;; Meanwhile, discourage other packages from using them.
-(let ((obsolete-functions '(time-stamp-month-dd-yyyy
-                           time-stamp-dd/mm/yyyy
-                           time-stamp-mon-dd-yyyy
-                           time-stamp-dd-mon-yy
-                           time-stamp-yy/mm/dd
-                           time-stamp-yyyy/mm/dd
-                           time-stamp-yyyy-mm-dd
-                           time-stamp-yymmdd
-                           time-stamp-hh:mm:ss
-                           time-stamp-hhmm)))
-  (while obsolete-functions
-    (make-obsolete (car obsolete-functions)
-                  "use time-stamp-string or format-time-string instead."
-                  "20.1")
-    (setq obsolete-functions (cdr obsolete-functions))))
+(dolist (function '(time-stamp-month-dd-yyyy time-stamp-dd/mm/yyyy
+                   time-stamp-mon-dd-yyyy   time-stamp-dd-mon-yy
+                   time-stamp-yy/mm/dd      time-stamp-yyyy/mm/dd
+                   time-stamp-yyyy-mm-dd    time-stamp-yymmdd
+                   time-stamp-hh:mm:ss      time-stamp-hhmm))
+  (make-obsolete function
+                "use `time-stamp-string' or `format-time-string' instead."
+                "20.1"))
 
 ;;; pretty form, suitable for a title page