* erc.el (erc-update-mode-line-buffer): Handle absent topic.

Fixes: debbugs:15377

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 70cab5af319..2c10f7fef22 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-14  Vivek Dasmohapatra  <vivek@etla.org>
+
+        * erc.el (erc-update-mode-line-buffer):
+        Handle absent topic.  (Bug#15377)
+
 2013-09-13  Glenn Morris  <rgm@gnu.org>
 
         * erc-desktop-notifications.el (dbus-debug): Declare.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 0bfd21d6c3a..771b7016bcd 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -6189,7 +6189,7 @@ if `erc-away' is non-nil."
                  ?m (erc-format-channel-modes)
                  ?n (or (erc-current-nick) "")
                  ?N (erc-format-network)
-                 ?o (erc-controls-strip erc-channel-topic)
+                 ?o (or (erc-controls-strip erc-channel-topic) "")
                  ?p (erc-port-to-string erc-session-port)
                  ?s (erc-format-target-and/or-server)
                  ?S (erc-format-target-and/or-network)