[Emacs-diffs] /srv/bzr/emacs/trunk r109356: * calendar/cal-html.el (cal-html-insert-agenda-days): Fix typo. (tiny change)

[Glenn Morris]

------------------------------------------------------------
revno: 109356
fixes bug: http://debbugs.gnu.org/12018
author: Rupert Swarbrick <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-08-01 00:15:44 -0700
message:
  * calendar/cal-html.el (cal-html-insert-agenda-days): Fix typo.  (tiny change)
modified:
  lisp/ChangeLog
  lisp/calendar/cal-html.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-01 02:14:20 +0000
+++ b/lisp/ChangeLog    2012-08-01 07:15:44 +0000
@@ -1,3 +1,8 @@
+2012-08-01  Rupert Swarbrick  <address@hidden>  (tiny change)
+
+       * calendar/cal-html.el (cal-html-insert-agenda-days):
+       Fix typo.  (Bug#12018)
+
 2012-07-31  Fabián Ezequiel Gallina  <address@hidden>
 
        Shell processes: enhancements to startup and CEDET compatibility.

=== modified file 'lisp/calendar/cal-html.el'
--- a/lisp/calendar/cal-html.el 2012-05-05 21:31:41 +0000
+++ b/lisp/calendar/cal-html.el 2012-08-01 07:15:44 +0000
@@ -396,7 +396,7 @@
        ;; 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)