[Erc-commit] [commit][master] erc-log: Fix bug with XEmacs and both viewing a log and writing to it

[mwolson]

commit 34e36a2be6750a904f0e22be3620ec75296ec8de
Author: Michael W. Olson <address@hidden>
Date:   Sun Sep 30 13:33:30 2007 -0400

    erc-log: Fix bug with XEmacs and both viewing a log and writing to it
    
    2007-09-30  Aidan Kehoe  <address@hidden>  (tiny change)
    
        * erc-log.el (erc-save-buffer-in-logs): Prevent spurious warnings
        when looking at a log file and concurrently saving to it.

diff --git a/CREDITS b/CREDITS
index 37ba59a..d14a9a6 100644
--- a/CREDITS
+++ b/CREDITS
@@ -167,6 +167,9 @@ Ivan Kanis <apple AT kanis DOT eu>:
 Exal de Jesus Garcia Carrillo  <exal AT gmx DOT de>:
   * Fixed some typos in the documentation.
 
+Aidan Kehoe  <kehoea AT parhasard DOT net>:
+  * Fixed a bug with log buffers in XEmacs in erc-log.el (1 line changed).
+
 ----
 
 P.S.: Many people contributed small bits to ERC whose names I probably
diff --git a/ChangeLog b/ChangeLog
index fec7357..a63508b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-30  Aidan Kehoe  <address@hidden>  (tiny change)
+
+       * erc-log.el (erc-save-buffer-in-logs): Prevent spurious warnings
+       when looking at a log file and concurrently saving to it.
+
 2007-09-18  Exal de Jesus Garcia Carrillo  <address@hidden>  (tiny change)
 
        * erc.texi (Special-Features): Fix small typo.
diff --git a/erc-log.el b/erc-log.el
index 1733b3d..7ea3c63 100644
--- a/erc-log.el
+++ b/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