From: Vivek Dasmohapatra Date: Sat, 14 Sep 2013 23:33:19 +0000 (-0700) Subject: * erc.el (erc-update-mode-line-buffer): Handle absent topic. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1626 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=95d0fa3a55974a6e9ef7f433d8ec8aeb9fd4a793;p=emacs.git * erc.el (erc-update-mode-line-buffer): Handle absent topic. Fixes: debbugs:15377 --- 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 + + * erc.el (erc-update-mode-line-buffer): + Handle absent topic. (Bug#15377) + 2013-09-13 Glenn Morris * 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)