aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2018-04-14 20:37:09 +0200
committerLars Ingebrigtsen2018-04-14 20:37:09 +0200
commit2f5d47b1df0248a6fd14b65889e564859cf305c8 (patch)
treeb81ba8f9f9df26c3182987ec94e25bdd7cbe96c5
parent5b535761f616f01277111cfbb9c635e7a417afad (diff)
downloademacs-2f5d47b1df0248a6fd14b65889e564859cf305c8.tar.gz
emacs-2f5d47b1df0248a6fd14b65889e564859cf305c8.zip
Ignore all-whitespace topics in erc
* lisp/erc/erc.el (erc-cmd-TOPIC): Ignore all-whitespace topics (bug#25153).
-rw-r--r--lisp/erc/erc.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 63228516be7..f1e21c9a96f 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -3693,8 +3693,10 @@ be displayed."
3693 ((string-match "^\\s-*\\([&#+!]\\S-+\\)\\s-\\(.*\\)$" topic) 3693 ((string-match "^\\s-*\\([&#+!]\\S-+\\)\\s-\\(.*\\)$" topic)
3694 (let ((ch (match-string 1 topic)) 3694 (let ((ch (match-string 1 topic))
3695 (topic (match-string 2 topic))) 3695 (topic (match-string 2 topic)))
3696 (erc-log (format "cmd: TOPIC [%s]: %s" ch topic)) 3696 ;; Ignore all-whitespace topics.
3697 (erc-server-send (format "TOPIC %s :%s" ch topic) nil ch)) 3697 (unless (equal (string-trim topic) "")
3698 (erc-log (format "cmd: TOPIC [%s]: %s" ch topic))
3699 (erc-server-send (format "TOPIC %s :%s" ch topic) nil ch)))
3698 t) 3700 t)
3699 ;; /topic #channel 3701 ;; /topic #channel
3700 ((string-match "^\\s-*\\([&#+!]\\S-+\\)" topic) 3702 ((string-match "^\\s-*\\([&#+!]\\S-+\\)" topic)