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

diff --cc lisp/ChangeLog
index b232210f3c75d35bbb7515cb53928f7c8febbaea,912b69ac38a1badd25c88c5e617d9238f7bdf353..a4dec7af492053e40fbf9a009e86abd96fa023be
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,12 -1,7 +1,16 @@@
 +2014-11-17  Ulf Jasper  <ulf.jasper@web.de>
 +
 +      * 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  <larsi@gnus.org>
+ 
+       * bindings.el (search-map): Move `eww-search-words' to `M-s M-w'.
+ 
  2014-11-17  Paul Eggert  <eggert@cs.ucla.edu>
  
        Port new time stamp handling to old Emacs and to XEmacs.

diff --cc test/ChangeLog
index 6e350cf8ec1865263210f4fdc341ab88ab3b89f3,fb004103cf8fdafb9af1f8ffb3372ca4e6d82ce8..2dfd5151f0950d84a93660af92b7738b995c72fd
--- 1/test/ChangeLog
--- 2/test/ChangeLog
+++ b/test/ChangeLog
@@@ -1,11 -1,9 +1,17 @@@
+ 2014-11-17  Glenn Morris  <rgm@gnu.org>
+ 
+       * 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  <ulf.jasper@web.de>
 +
 +      * 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  <ulf.jasper@web.de>
  
        * automated/icalendar-tests.el (icalendar-tests--test-import):