Merge from emacs-24 branch

[gnu-emacs] / test / automated / icalendar-tests.el

diff --git a/test/automated/icalendar-tests.el b/test/automated/icalendar-tests.el
index b48ca94f072c24c014d787a014e2dc2863691549..503ea22d2b82bccf2c7c2daf323ceae7a9b623c0 100644 (file)
--- a/test/automated/icalendar-tests.el
+++ b/test/automated/icalendar-tests.el
@@ -731,10 +731,9 @@ DTSTART;VALUE=DATE-TIME:20030919"
    "&19/9/2003 non-recurring allday\n"
    "&9/19/2003 non-recurring allday\n")
   (icalendar-tests--test-import
-   ;; do not remove the trailing blank after "long"!
-   "SUMMARY:long
- summary
-DTSTART;VALUE=DATE:20030919"
+   ;; Checkdoc removes trailing blanks.  Therefore: format!
+   (format "%s\n%s\n%s" "SUMMARY:long " " summary"
+           "DTSTART;VALUE=DATE:20030919")
    "&2003/9/19 long summary\n"
    "&19/9/2003 long summary\n"
    "&9/19/2003 long summary\n")