Merge from emacs--devo--0

[gnu-emacs] / lisp / time-stamp.el

diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index 06a984ba6a512a80af512d53f0372821d3473ad7..bb7e025e303e4259dc7685c8ed20eb8a07607137 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, 2007 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -128,7 +128,7 @@ Format is the same as that used by the environment variable TZ on your system."
   :type '(choice (const nil) string)
   :group 'time-stamp
   :version "20.1")
-
+;;;###autoload(put 'time-stamp-time-zone 'safe-local-variable 'string-or-null-p)
 
 ;;; Do not change time-stamp-line-limit, time-stamp-start,
 ;;; time-stamp-end, time-stamp-pattern, time-stamp-inserts-lines,