Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 circe (2.0-1) unstable; urgency=medium
 .
   * Change maintainer address to pkg-emacsen-addons
   * Merge all binary packages into elpa-circe
   * rebuild with dh-elpa 0.0.12
Author: David Bremner <bremner@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- circe-2.0.orig/lui-irc-colors.el
+++ circe-2.0/lui-irc-colors.el
@@ -296,25 +296,14 @@ This is an appropriate function for `lui
 
 (defun lui-irc-propertize (start end boldp inversep italicp underlinep fg bg)
   "Propertize the region between START and END."
-  (add-face-text-property start end
-   (append (if boldp
-               '(bold)
-             nil)
-           (if inversep
-               '(lui-irc-colors-inverse-face)
-             nil)
-           (if italicp
-               '(italic)
-             nil)
-           (if underlinep
-               '(underline)
-             nil)
-           (if fg
-               (list (lui-irc-colors-face 'fg fg))
-             nil)
-           (if bg
-               (list (lui-irc-colors-face 'bg bg))
-             nil))))
+  (let ((faces (append (and boldp '(bold))
+                       (and inversep '(lui-irc-colors-inverse-face))
+                       (and italicp '(italic))
+                       (and underlinep '(underline))
+                       (and fg (list (lui-irc-colors-face 'fg fg)))
+                       (and bg (list (lui-irc-colors-face 'bg bg))))))
+    (when faces
+      (add-face-text-property start end faces))))
 
 (defun lui-irc-colors-face (type n)
   "Return a face appropriate for face number N.
