Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emacs
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
emacs
emacs
Commits
dfba918c
Commit
dfba918c
authored
Jul 08, 2019
by
Lars Ingebrigtsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow adding time zones
parent
c6323320
Pipeline
#2305
failed with stage
in 53 minutes and 45 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
lisp/calendar/time-date.el
lisp/calendar/time-date.el
+4
-0
test/lisp/calendar/time-date-tests.el
test/lisp/calendar/time-date-tests.el
+7
-0
No files found.
lisp/calendar/time-date.el
View file @
dfba918c
...
...
@@ -421,6 +421,10 @@ changes in daylight saving time are not taken into account."
(
setq
seconds
(
+
(
*
(
or
(
decoded-time-hour
delta
)
0
)
3600
)
(
*
(
or
(
decoded-time-minute
delta
)
0
)
60
)
(
or
(
decoded-time-second
delta
)
0
)))
;; Time zone adjustments are basically the same as time adjustments.
(
setq
seconds
(
+
seconds
(
or
(
decoded-time-zone
delta
)
0
)))
(
cond
((
>
seconds
0
)
(
decoded-time--alter-second
time
seconds
t
))
...
...
test/lisp/calendar/time-date-tests.el
View file @
dfba918c
...
...
@@ -97,6 +97,13 @@
'
(
12
15
16
9
7
2019
1
t
7200
)))
))
(
ert-deftest
test-decoded-add-zone
()
(
let
((
time
'
(
12
15
16
8
7
2019
1
t
7200
)))
(
should
(
equal
(
decoded-time-add
time
(
mdec
:zone
-3600
))
'
(
12
15
15
8
7
2019
1
t
7200
)))
(
should
(
equal
(
decoded-time-add
time
(
mdec
:zone
-7200
))
'
(
12
15
14
8
7
2019
1
t
7200
)))))
(
require
'ert
)
;;; time-date-tests.el ends here
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment