From: Ulf Jasper Date: Mon, 17 Nov 2014 20:06:33 +0000 (+0100) Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs X-Git-Tag: emacs-25.0.90~2635^2~437 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9e35ff6bcf9c52fb295b4eb5d4dcde37b6a60b65;p=emacs.git Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs --- 9e35ff6bcf9c52fb295b4eb5d4dcde37b6a60b65 diff --cc lisp/ChangeLog index b232210f3c7,912b69ac38a..a4dec7af492 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,12 -1,7 +1,16 @@@ +2014-11-17 Ulf Jasper + + * 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 Lars Magne Ingebrigtsen + + * bindings.el (search-map): Move `eww-search-words' to `M-s M-w'. + 2014-11-17 Paul Eggert Port new time stamp handling to old Emacs and to XEmacs. diff --cc test/ChangeLog index 6e350cf8ec1,fb004103cf8..2dfd5151f09 --- a/test/ChangeLog +++ b/test/ChangeLog @@@ -1,11 -1,9 +1,17 @@@ + 2014-11-17 Glenn Morris + + * automated/occur-tests.el (occur-test-case, occur-test-create): + In case of failure, show the actual string, rather than just nil. + (occur-tests): Update for apparent change in output re control-chars. + +2014-11-17 Ulf Jasper + + * 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 * automated/icalendar-tests.el (icalendar-tests--test-import):