1 files changed, 5 insertions, 5 deletions

@@ -18,11 +18,11 @@ message the current topic."
   (let ((topic
          (save-excursion
            (goto-char (point-max))
-           (or (re-search-backward (rx "*** Topic change" (+ (not ":")) ": "))
-               (re-search-backward
-                (rx "*** Topic for #" (+ (or word "-")) ": ")))
+           (or (re-search-backward
+                (rx (group "*** Topic" (+ (not ":")) ": ")
+                    (group (+ nonl)))))
            (buffer-substring-no-properties
-            (match-end 0) (line-end-position)))))
+            (match-beginning 2) (match-end 2)))))
     (when message
       (message "%s" topic))
     topic))
@@ -53,7 +53,7 @@ message the current topic."
    (propertize
     (concat
      (acdw-irc/margin-format (buffer-name) "" ">")
-     " ")  
+     " ")
     'face 'circe-prompt-face
     'read-only t
     'intangible t