branch: elpa/casual
commit ea48b8fcd3d1d7162ae4078f4a7e562d50cd1aab
Merge: be93172baa 2d3e83071f
Author: Charles Choi <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #229 from
kickingvegas/merge-development-to-main-20250604_144343
Merge development to main 20250604_144343
---
lisp/casual-timezone-utils.el | 8 ++++----
lisp/casual.el | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lisp/casual-timezone-utils.el b/lisp/casual-timezone-utils.el
index 8dae47eb90..aeb68dd47a 100644
--- a/lisp/casual-timezone-utils.el
+++ b/lisp/casual-timezone-utils.el
@@ -166,13 +166,13 @@ The format of the timestamp is defined in the variable
(casual-timezone-zone-info))))
(parse-ts (string-split datestr))
(datestamp (nth 0 parse-ts))
- (timestamp (nth 1 parse-ts))
+ (timestamp (or (nth 1 parse-ts) "00:00"))
(local-tz (nth 1 (current-time-zone)))
(remote-time
(format-time-string
casual-timezone-convert-datestamp-format
(date-to-time
- (concat datestamp "T" timestamp ":00" " " local-tz))
+ (concat datestamp " " timestamp ":00" " " local-tz))
remote-tz))
(remote-time-tz (concat remote-tz " " remote-time)))
(kill-new remote-time-tz)
@@ -204,12 +204,12 @@ The format of the timestamp is defined in the variable
(nth 0 (current-time-zone nil remote-tz))))
(parse-ts (string-split datestr))
(datestamp (nth 0 parse-ts))
- (timestamp (nth 1 parse-ts))
+ (timestamp (or (nth 1 parse-ts) "00:00"))
;; (local-tz (nth 1 (current-time-zone)))
(index-time
(format-time-string
casual-timezone-convert-datestamp-format
- (date-to-time (concat datestamp "T" timestamp ":00" " " tzcode)))))
+ (date-to-time (concat datestamp " " timestamp ":00" " " tzcode)))))
(kill-new index-time)
(message index-time)
index-time))
diff --git a/lisp/casual.el b/lisp/casual.el
index 383732aee6..591b31c3ec 100644
--- a/lisp/casual.el
+++ b/lisp/casual.el
@@ -5,7 +5,7 @@
;; Author: Charles Choi <[email protected]>
;; URL: https://github.com/kickingvegas/casual
;; Keywords: tools, wp
-;; Version: 2.5.1
+;; Version: 2.5.2-rc.1
;; Package-Requires: ((emacs "29.1") (transient "0.9.0"))
;; This program is free software; you can redistribute it and/or modify
