[Erc-commit] [commit][emacs22] erc-dcc: Fix wrong type argument bug

[mwolson]

commit c1f17cf8477168f8b2963b239bfd2d0f30947cc8
Author: Michael Olson <address@hidden>
Date:   Tue Nov 21 02:16:07 2006 +0000

    erc-dcc: Fix wrong type argument bug
    
    2006-11-20  Andrea Russo  <address@hidden>
    
        * erc-dcc.el (erc-dcc-chat-setup): Initialize `erc-input-marker'
        before calling `erc-display-prompt'.
    git-archimport-id: address@hidden/erc--main--0--patch-64

diff --git a/ChangeLog b/ChangeLog
index 60a9e66..74c9b29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-20  Andrea Russo  <address@hidden>
+
+       * erc-dcc.el (erc-dcc-chat-setup): Initialize `erc-input-marker'
+       before calling `erc-display-prompt'.
+
 2006-11-20  Michael Olson  <address@hidden>
 
        * erc.el (erc-update-modules): Display better error message when
diff --git a/erc-dcc.el b/erc-dcc.el
index 26d4557..9d5a8e9 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -1035,6 +1035,7 @@ other client."
     (setq erc-dcc-entry-data entry)
     (setq erc-dcc-unprocessed-output "")
     (setq erc-insert-marker (set-marker (make-marker) (point-max)))
+    (setq erc-input-marker (make-marker))
     (erc-display-prompt buffer (point-max))
     (set-process-buffer proc buffer)
     (add-hook 'kill-buffer-hook 'erc-dcc-chat-buffer-killed nil t)