[Emacs-diffs] [emacs] 06/07: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Ulf Jasper]

branch: master
commit 9e35ff6bcf9c52fb295b4eb5d4dcde37b6a60b65
Merge: cc5519d 5813f93
Author: Ulf Jasper <address@hidden>
Date:   Mon Nov 17 21:06:33 2014 +0100

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

 etc/NEWS                      |    2 +-
 lisp/ChangeLog                |    6 +++++-
 lisp/bindings.el              |    2 +-
 test/ChangeLog                |    6 ++++++
 test/automated/occur-tests.el |   21 ++++++++++-----------
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --cc lisp/ChangeLog
index b232210,912b69a..a4dec7a
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,12 -1,7 +1,16 @@@
 +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  Lars Magne Ingebrigtsen  <address@hidden>
+ 
+       * bindings.el (search-map): Move `eww-search-words' to `M-s M-w'.
+ 
  2014-11-17  Paul Eggert  <address@hidden>
  
        Port new time stamp handling to old Emacs and to XEmacs.
diff --cc test/ChangeLog
index 6e350cf,fb00410..2dfd515
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@@ -1,13 -1,11 +1,19 @@@
+ 2014-11-17  Glenn Morris  <address@hidden>
+ 
+       * 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  <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