1 files changed, 8 insertions, 3 deletions
diff --git a/.emacs b/.emacs
index d2e522c..ff96318 100644
--- a/.emacs
+++ b/.emacs
@@ -699,10 +699,15 @@
   (erc-use-auth-source-for-nickserv-password t)
   (erc-user-full-name 'user-full-name)
   :config
+  (if (version< erc-version "5.6-git")
+      (my/setopt
+       erc-modules
+       (my/list-update erc-modules '(log notifications) '(fill)))
+    (my/setopt
+     erc-fill-function 'erc-fill-wrap
+     erc-log-filter-function 'erc-stamp-prefix-log-filter
+     erc-modules (my/list-update erc-modules '(log notifications))))
   (my/setopt
-   erc-modules
-   (my/list-update erc-modules
-     '(log notifications) '(fill))
    erc-track-exclude-types
    (my/list-update erc-track-exclude-types
      '("JOIN" "PART" "QUIT"))))