diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-02 23:43:44 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-02 23:44:18 -0700 |
| commit | b787d5501bad8036016d835faa2f90bb0904c038 (patch) | |
| tree | 1bc1ab283f0ef8cf95a16afbbb71a682fbf5d180 /lisp/org/ox-icalendar.el | |
| parent | 13c8f29ce361e3aad71cf2b44e76d5cfdaf7dda3 (diff) | |
| download | emacs-b787d5501bad8036016d835faa2f90bb0904c038.tar.gz | |
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.
Diffstat (limited to 'lisp/org/ox-icalendar.el')
| -rw-r--r-- | lisp/org/ox-icalendar.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org/ox-icalendar.el b/lisp/org/ox-icalendar.el index 0d34ba19f45..cd54d1ee8de 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." |