branch: externals/excorporate
commit e9047fd55c5196125165c3f7bcceba7b755ef21d
Author: Thomas Fitzsimmons <fitz...@fitzsim.org>
Commit: Thomas Fitzsimmons <fitz...@fitzsim.org>
Move excorporate-customize-time-zone
* excorporate-time-zones.el (excorporate-customize-time-zone):
Move function to excorporate.el.
* excorporate.el (excorporate-time-zones): Fix typo.
(excorporate-customize-time-zone): Move function here, from
excorporate-time-zones.el.
---
excorporate-time-zones.el | 12 ------------
excorporate.el | 14 +++++++++++++-
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/excorporate-time-zones.el b/excorporate-time-zones.el
index 3c9b53f..0a17be9 100644
--- a/excorporate-time-zones.el
+++ b/excorporate-time-zones.el
@@ -833,18 +833,6 @@
(concat "A hash table mapping `current-time-zone' values to"
" IANA/Olson time zone names."))
-(defun excorporate-customize-time-zone ()
- "Prompt for a server-style time zone from a list of valid values."
- (interactive)
- (let ((zone (completing-read
- "Excorporate time zone: "
- (cons "Emacs Built-in"
- (hash-table-values exco--time-zone-olson-to-server))
- nil t)))
- (unless (equal zone "")
- (customize-save-variable 'excorporate-time-zone
- (if (equal zone "Emacs Built-in") nil zone)))))
-
(defun exco-time-zone (&optional emacs-time-zone)
"Return server style time zone string.
Return `excorporate-time-zone' if it is non-nil, or look up the
diff --git a/excorporate.el b/excorporate.el
index bd3a668..88a5658 100644
--- a/excorporate.el
+++ b/excorporate.el
@@ -118,7 +118,7 @@
(require 'fsm)
(require 'excorporate-calendar)
(require 'org)
-(require 'excorporate-time-zone)
+(require 'excorporate-time-zones)
(defgroup excorporate nil
"Exchange support."
@@ -1254,6 +1254,18 @@ ARGUMENT is the prefix argument."
(t
(error "Excorporate: Invalid configuration"))))
+(defun excorporate-customize-time-zone ()
+ "Prompt for a server-style time zone from a list of valid values."
+ (interactive)
+ (let ((zone (completing-read
+ "Excorporate time zone: "
+ (cons "Emacs Built-in"
+ (hash-table-values exco--time-zone-olson-to-server))
+ nil t)))
+ (unless (equal zone "")
+ (customize-save-variable 'excorporate-time-zone
+ (if (equal zone "Emacs Built-in") nil zone)))))
+
(defun excorporate-disconnect ()
"Disconnect a server connection."
(interactive)
