   (flyspell-mode)
   (visual-line-mode)
   (rcirc-update-prompt)
-  (rcirc-track-minor-mode)
-  (add-to-list 'window-size-change-functions
-               'pjones:rcirc-update-fill-column-all-windows))
+  (rcirc-track-minor-mode))
 
 (defun pjones:rcirc-activity-string ()
   (when (string= "[]" rcirc-activity-string)

    (if (eq major-mode 'rcirc-mode)
        (setq rcirc-fill-column (- (window-width window) 2)))))

(defun pjones:rcirc-update-fill-column-all-windows ()
  "Call `pjones:rcirc-update-fill-column' for all windows."
  (walk-windows 'pjones:rcirc-update-fill-column 'no-minibuf nil))

(defun pjones:rcirc-hook ()
  (require 'rcirc-color)

(add-hook 'rcirc-mode-hook 'pjones:rcirc-hook)
(add-hook 'rcirc-update-activity-string-hook 'pjones:rcirc-activity-string)
(add-hook 'rcirc-print-hooks 'pjones:rcirc-print-hook)
(add-hook 'window-size-change-functions 'pjones:rcirc-update-fill-column-all-windows)

;; Local Variables:
;; byte-compile-warnings: (not cl-functions)
