summaryrefslogtreecommitdiff
path: root/lisp/vc/add-log.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-09-03 16:03:38 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-09-03 16:03:38 -0700
commitb49e353d9d01adbe60bc5d0b1658b4ef978b0b06 (patch)
tree9f2ffa6f7a6562abf661a4951012b488ad8b1ae7 /lisp/vc/add-log.el
parent74b880cbc18bd0194c7b1fc44c4a983ee05adae2 (diff)
parentbc3200871917d5c54c8c4299a06bf8f8ba2ea02d (diff)
downloademacs-b49e353d9d01adbe60bc5d0b1658b4ef978b0b06.tar.gz
Merge from trunk.
Diffstat (limited to 'lisp/vc/add-log.el')
-rw-r--r--lisp/vc/add-log.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index e5aead2309f..9170d7b9424 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -853,9 +853,9 @@ non-nil, otherwise in local time."
(let ((tz (getenv "TZ")))
(unwind-protect
(progn
- (set-time-zone-rule add-log-time-zone-rule)
+ (setenv "TZ" add-log-time-zone-rule)
(funcall add-log-time-format))
- (set-time-zone-rule tz)))
+ (setenv "TZ" tz)))
(funcall add-log-time-format))
" " full-name
" <" addr ">"))