[Emacs-diffs] [emacs] 05/07: Merge branch 'uj-icalendar-bug#5433'

[Ulf Jasper]

branch: master
commit cc5519db12f554a40591ac8a7f4febe17a3bd53b
Merge: 62243cb 16b5f50
Author: Ulf Jasper <address@hidden>
Date:   Mon Nov 17 21:00:24 2014 +0100

    Merge branch 'uj-icalendar-bug#5433'

 lisp/ChangeLog                    |    9 +++
 lisp/calendar/icalendar.el        |   66 +++++++++++++++++++++++-
 test/ChangeLog                    |    8 +++
 test/automated/icalendar-tests.el |  100 +++++++++++++++++++++++++++++++++++-
 4 files changed, 178 insertions(+), 5 deletions(-)

diff --cc lisp/ChangeLog
index c30a2dd,2bca643..b232210
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,70 -1,16 +1,79 @@@
+ 2014-11-17  Ulf Jasper  <address@hidden>
+ 
+       * calendar/icalendar.el (icalendar-export-alarms): New
+       customizable variable.
+       (icalendar-export-region): Export alarms as specified in
+       `icalendar-export-alarms'.
+       (icalendar--create-ical-alarm, icalendar--do-create-ical-alarm):
+       New functions for exporting alarms.
+ 
 +2014-11-17  Paul Eggert  <address@hidden>
 +
 +      Port new time stamp handling to old Emacs and to XEmacs.
 +      This is needed for Gnus, which copies time-date.el and which
 +      runs on older Emacs implementations.
 +      * calendar/time-date.el (with-decoded-time-value):
 +      Handle 'nil' and floating-point arg more compatibly with new Emacs.
 +      (encode-time-value, with-decoded-time-value):
 +      Obsolete only if new Emacs.
 +      (time-add, time-subtract, time-less-p): Define if not new Emacs.
 +
 +      Improve time stamp handling, and be more consistent about it.
 +      This implements a suggestion made in:
 +      http://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00587.html
 +      Among other things, this means timer.el no longer needs to
 +      autoload the time-date module.
 +      * allout-widgets.el (allout-elapsed-time-seconds): Doc fix.
 +      * arc-mode.el (archive-ar-summarize):
 +      * calendar/time-date.el (seconds-to-time, days-to-time, time-since):
 +      * emacs-lisp/timer.el (timer-relative-time, timer-event-handler)
 +      (run-at-time, with-timeout-suspend, with-timeout-unsuspend):
 +      * net/tramp.el (tramp-time-less-p, tramp-time-subtract):
 +      * proced.el (proced-time-lessp):
 +      * timezone.el (timezone-time-from-absolute):
 +      * type-break.el (type-break-schedule, type-break-time-sum):
 +      Simplify by using new functionality.
 +      * calendar/cal-dst.el (calendar-next-time-zone-transition):
 +      Do not return time values in obsolete and undocumented (HI . LO)
 +      format; use (HI LO) instead.
 +      * calendar/time-date.el (with-decoded-time-value):
 +      Treat 'nil' as current time.  This is mostly for XEmacs.
 +      (encode-time-value, with-decoded-time-value): Obsolete.
 +      (time-add, time-subtract, time-less-p): Use no-op autoloads, for
 +      XEmacs.  Define only if XEmacs, as they're now C builtins in Emacs.
 +      * ldefs-boot.el: Update to match new time-date.el
 +      * proced.el: Do not require time-date.
 +
 +2014-11-16  Lars Magne Ingebrigtsen  <address@hidden>
 +
 +      * net/eww.el (eww-mode): Make the buffer read-only.
 +      (eww-form-text): Inhibit read-only-ness in text input fields
 +      (bug#16476).
 +
 +2014-11-16  Stefan Monnier  <address@hidden>
 +
 +      * simple.el (execute-extended-command--shorter): Cut search here.
 +      (execute-extended-command): Instead of here.
 +
 +2014-11-16  Fabián Ezequiel Gallina  <address@hidden>
 +
 +      * progmodes/python.el (python-mode): Avoid use of set-local to
 +      keep Emacs 24.x compatibility.
 +
 +2014-11-16  Lars Magne Ingebrigtsen  <address@hidden>
 +
 +      * net/shr.el (shr): Move to the new defgroup `web'.
 +
 +      * net/eww.el (eww): Ditto.
 +
 +      * simple.el (execute-extended-command): Don't show the help
 +      message if the binding isn't significantly shorter than the
 +      M-x command the user typed (bug#19013).
 +
  2014-11-16  Ulf Jasper  <address@hidden>
  
 -      * calendar/icalendar.el (icalendar--convert-tz-offset): Return
 -      complete cons when offsets of standard time and daylight saving
 +      * calendar/icalendar.el (icalendar--convert-tz-offset):
 +      Return complete cons when offsets of standard time and daylight saving
        time are equal.
        (icalendar-export-region): Fix unbound variable warning.
  
diff --cc test/ChangeLog
index 47bbfb3,5290ef3..6e350cf
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@@ -1,10 -1,11 +1,18 @@@
  2014-11-17  Ulf Jasper  <address@hidden>
  
+       * automated/icalendar-tests.el (icalendar-tests--test-export): New
+       optional parameter `alarms'.
+       (icalendar-export-alarms): New test for exporting icalendar
+       alarms.
+       (icalendar-tests--test-cycle): Let `icalendar-export-alarms' be nil.
+ 
++2014-11-17  Ulf Jasper  <address@hidden>
++
 +      * automated/icalendar-tests.el (icalendar-tests--test-import):
 +      Mention timezone in doc string.  Clean up.
 +      (icalendar-real-world): Add another test case for no-dst
 +      timezones.
 +
  2014-11-16  Ulf Jasper  <address@hidden>
  
        * automated/icalendar-tests.el (icalendar--parse-vtimezone): Add
diff --cc test/automated/icalendar-tests.el
index b45806e,ddff155..5454672
--- a/test/automated/icalendar-tests.el
+++ b/test/automated/icalendar-tests.el
@@@ -753,6 -755,97 +755,97 @@@ RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20010
  SUMMARY:block no end time
  "))
  
+ (ert-deftest icalendar-export-alarms ()
+   "Perform export test with different settings for exporting alarms."
+   ;; no alarm
+   (icalendar-tests--test-export
+    "2014 Nov 17 19:30 no alarm"
+    "17 Nov 2014 19:30 no alarm"
+    "Nov 17 2014 19:30 no alarm"
+    "DTSTART;VALUE=DATE-TIME:20141117T193000
+ DTEND;VALUE=DATE-TIME:20141117T203000
+ SUMMARY:no alarm
+ "
+    nil)
+ 
+     ;; 10 minutes in advance, audio
+     (icalendar-tests--test-export
+      "2014 Nov 17 19:30 audio alarm"
+      "17 Nov 2014 19:30 audio alarm"
+      "Nov 17 2014 19:30 audio alarm"
+      "DTSTART;VALUE=DATE-TIME:20141117T193000
+ DTEND;VALUE=DATE-TIME:20141117T203000
+ SUMMARY:audio alarm
+ BEGIN:VALARM
+ ACTION:AUDIO
+ TRIGGER:-PT10M
+ END:VALARM
+ "
+      '(10 ((audio))))
+ 
+     ;; 20 minutes in advance, display
+     (icalendar-tests--test-export
+      "2014 Nov 17 19:30 display alarm"
+      "17 Nov 2014 19:30 display alarm"
+      "Nov 17 2014 19:30 display alarm"
+      "DTSTART;VALUE=DATE-TIME:20141117T193000
+ DTEND;VALUE=DATE-TIME:20141117T203000
+ SUMMARY:display alarm
+ BEGIN:VALARM
+ ACTION:DISPLAY
+ TRIGGER:-PT20M
+ DESCRIPTION:display alarm
+ END:VALARM
+ "
+      '(20 ((display))))
+ 
+     ;; 66 minutes in advance, email
+     (icalendar-tests--test-export
+      "2014 Nov 17 19:30 email alarm"
+      "17 Nov 2014 19:30 email alarm"
+      "Nov 17 2014 19:30 email alarm"
+      "DTSTART;VALUE=DATE-TIME:20141117T193000
+ DTEND;VALUE=DATE-TIME:20141117T203000
+ SUMMARY:email alarm
+ BEGIN:VALARM
+ ACTION:EMAIL
+ TRIGGER:-PT66M
+ DESCRIPTION:email alarm
+ SUMMARY:email alarm
+ ATTENDEE:MAILTO:address@hidden
+ ATTENDEE:MAILTO:address@hidden
+ END:VALARM
+ "
+      '(66 ((email ("address@hidden" "address@hidden")))))
+ 
+     ;; 2 minutes in advance, all alarms
+     (icalendar-tests--test-export
+      "2014 Nov 17 19:30 all alarms"
+      "17 Nov 2014 19:30 all alarms"
+      "Nov 17 2014 19:30 all alarms"
+      "DTSTART;VALUE=DATE-TIME:20141117T193000
+ DTEND;VALUE=DATE-TIME:20141117T203000
+ SUMMARY:all alarms
+ BEGIN:VALARM
+ ACTION:EMAIL
+ TRIGGER:-PT2M
+ DESCRIPTION:all alarms
+ SUMMARY:all alarms
+ ATTENDEE:MAILTO:address@hidden
+ ATTENDEE:MAILTO:address@hidden
+ END:VALARM
+ BEGIN:VALARM
+ ACTION:AUDIO
+ TRIGGER:-PT2M
+ END:VALARM
+ BEGIN:VALARM
+ ACTION:DISPLAY
+ TRIGGER:-PT2M
+ DESCRIPTION:all alarms
+ END:VALARM
+ "
+      '(2 ((email ("address@hidden" "address@hidden")) (audio) (display)))))
 -  
++
  ;; ======================================================================
  ;; Import tests
  ;; ======================================================================