From b686ba0618136facee41606ae062203f17615f79 Mon Sep 17 00:00:00 2001
From: Rupert Swarbrick <rswarbrick@gmail.com>
Date: Wed, 1 Aug 2012 00:15:44 -0700
Subject: [PATCH] * calendar/cal-html.el (cal-html-insert-agenda-days): Fix
 typo.  (tiny change)

Fixes: debbugs:12018
---
 lisp/ChangeLog            | 5 +++++
 lisp/calendar/cal-html.el | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3bf0d9f9ca..f854e4b1c0 100644
--- 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 679fae98bc..9e9544d707 100644
--- 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)
-- 
2.20.1