Sync from upstream ERC

[bpt/emacs.git] / lisp / erc / erc-log.el

diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 1733b3d..7ea3c63 100644 (file)
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -415,7 +415,8 @@ You can save every individual message by putting this function on
   (or buffer (setq buffer (current-buffer)))
   (when (erc-logging-enabled buffer)
     (let ((file (erc-current-logfile buffer))
-         (coding-system erc-log-file-coding-system))
+         (coding-system erc-log-file-coding-system)
+         (inhibit-clash-detection t))  ; needed for XEmacs
       (save-excursion
        (with-current-buffer buffer
          (save-restriction