HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-23; up to 2012-01-19T07:15:48Z!rgm@gnu.org.
[bpt/emacs.git]
/
lisp
/
time-stamp.el
diff --git
a/lisp/time-stamp.el
b/lisp/time-stamp.el
index
5934058
..
1396312
100644
(file)
--- a/
lisp/time-stamp.el
+++ b/
lisp/time-stamp.el
@@
-1,6
+1,6
@@
;;; time-stamp.el --- Maintain last change time stamps in files edited by Emacs
;;; time-stamp.el --- Maintain last change time stamps in files edited by Emacs
-;; Copyright (C) 1989, 1993-1995, 1997, 2000-201
1
+;; Copyright (C) 1989, 1993-1995, 1997, 2000-201
2
;; Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
;; Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
@@
-424,10
+424,10
@@
format the string."
(let ((ts-real-time-zone (getenv "TZ")))
(unwind-protect
(progn
(let ((ts-real-time-zone (getenv "TZ")))
(unwind-protect
(progn
- (set
-time-zone-rule
time-stamp-time-zone)
+ (set
env "TZ"
time-stamp-time-zone)
(format-time-string
(time-stamp-string-preprocess ts-format)))
(format-time-string
(time-stamp-string-preprocess ts-format)))
- (set
-time-zone-rule
ts-real-time-zone)))
+ (set
env "TZ"
ts-real-time-zone)))
(format-time-string
(time-stamp-string-preprocess ts-format)))
;; handle version 1 compatibility
(format-time-string
(time-stamp-string-preprocess ts-format)))
;; handle version 1 compatibility