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

Fixes: debbugs:15377

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 70cab5af3197fcc9fedda6113c9350bb69cb7a49..2c10f7fef228c70bbe7585c0356aed47929a6e76 100644 (file)
--- 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 0bfd21d6c3a26f63b60c006be0f8cf43435166b1..771b7016bcdae3bbd2ad2ea2837dae56a353fe36 100644 (file)
--- 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)