[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 b787d55: More format-time-string change fixups
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] emacs-25 b787d55: More format-time-string change fixups |
Date: |
Sun, 03 Apr 2016 06:44:26 +0000 |
branch: emacs-25
commit b787d5501bad8036016d835faa2f90bb0904c038
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
More format-time-string change fixups
* lisp/net/tramp-sh.el (tramp-sh-handle-set-file-times):
* lisp/org/org.el (org-timestamp-format):
Fix doc to match new format-time-string behavior.
* lisp/org/ox-icalendar.el (org-icalendar-convert-timestamp):
Use (not (not X)) to treat non-nil values of utc arg as UTC.
---
lisp/net/tramp-sh.el | 2 +-
lisp/org/org.el | 9 +++++----
lisp/org/ox-icalendar.el | 3 ++-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 5b90832..aa0ac02 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -1525,7 +1525,7 @@ of."
(current-time)
time))
;; With GNU Emacs, `format-time-string' has an
- ;; optional parameter UNIVERSAL. This is preferred,
+ ;; optional parameter ZONE. This is preferred,
;; because we could handle the case when the remote
;; host is located in a different time zone as the
;; local host.
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 6e7d54d..d2b48a6 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -22663,7 +22663,7 @@ contains commented lines. Otherwise, comment them."
"Non-nil when TIMESTAMP has a time specified."
(org-element-property :hour-start timestamp))
-(defun org-timestamp-format (timestamp format &optional end utc)
+(defun org-timestamp-format (timestamp format &optional end zone)
"Format a TIMESTAMP element into a string.
FORMAT is a format specifier to be passed to
@@ -22672,8 +22672,9 @@ FORMAT is a format specifier to be passed to
When optional argument END is non-nil, use end of date-range or
time-range, if possible.
-When optional argument UTC is non-nil, time will be expressed as
-Universal Time."
+The optional ZONE is omitted or nil for Emacs local time, t for
+Universal Time, `wall' for system wall clock time, or a string as in
+`set-time-zone-rule' for a time zone rule."
(format-time-string
format
(apply 'encode-time
@@ -22683,7 +22684,7 @@ Universal Time."
(if end '(:minute-end :hour-end :day-end :month-end :year-end)
'(:minute-start :hour-start :day-start :month-start
:year-start)))))
- utc))
+ zone))
(defun org-timestamp-split-range (timestamp &optional end)
"Extract a timestamp object from a date or time range.
diff --git a/lisp/org/ox-icalendar.el b/lisp/org/ox-icalendar.el
index 0d34ba1..cd54d1e 100644
--- a/lisp/org/ox-icalendar.el
+++ b/lisp/org/ox-icalendar.el
@@ -393,7 +393,8 @@ Universal Time, ignoring `org-icalendar-date-time-format'."
;; Convert timestamp into internal time in order to use
;; `format-time-string' and fix any mistake (i.e. MI >= 60).
(encode-time 0 mi h d m y)
- (or utc (and with-time-p (org-icalendar-use-UTC-date-time-p)))))))
+ (not (not (or utc (and with-time-p
+ (org-icalendar-use-UTC-date-time-p)))))))))
(defun org-icalendar-dtstamp ()
"Return DTSTAMP property, as a string."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 b787d55: More format-time-string change fixups,
Paul Eggert <=