* calendar/cal-html.el (cal-html-insert-agenda-days): Fix typo. (tiny change)

Fixes: debbugs:12018

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3bf0d9f9cadfa4136d59b0ad05ca3ad9c66ab992..f854e4b1c072546a1d25bbb37578f142e42ad456 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-01  Rupert Swarbrick  <rswarbrick@gmail.com>  (tiny change)
+
+       * calendar/cal-html.el (cal-html-insert-agenda-days):
+       Fix typo.  (Bug#12018)
+
 2012-07-31  Fabián Ezequiel Gallina  <fgallina@cuca>
 
        Shell processes: enhancements to startup and CEDET compatibility.

diff --git a/lisp/calendar/cal-html.el b/lisp/calendar/cal-html.el
index 679fae98bc835e48aff49a074293ec9fc3bd813a..9e9544d707b90541039ffb6c388b9f546dce88e1 100644 (file)
--- a/lisp/calendar/cal-html.el
+++ b/lisp/calendar/cal-html.el
@@ -396,7 +396,7 @@ holidays in HOLIDAY-LIST."
        ;; Diary entries.
        cal-html-b-tabledata-string
        (cal-html-htmlify-list holiday-list date t)
-       (and holiday-list diary-list "<BR>\n")
+       (if (and holiday-list diary-list) "<BR>\n" "")
        (cal-html-htmlify-list diary-list date)
        cal-html-e-tabledata-string
        cal-html-e-tablerow-string)