[Erc-commit] [commit][master] erc-dcc.el: Fix error in erc-dcc-send-sentinel.

[mwolson]

commit 7312d2b4da9913419c7ed2d9ada173603ffe52d6
Author: Michael W. Olson <address@hidden>
Date:   Thu Jan 17 01:20:47 2008 -0500

    erc-dcc.el: Fix error in erc-dcc-send-sentinel.

diff --git a/CREDITS b/CREDITS
index ca1f4da..af13027 100644
--- a/CREDITS
+++ b/CREDITS
@@ -179,6 +179,9 @@ Giorgos Keramidas <address@hidden>:
 Tom Tromey <address@hidden>:
   * Contributed erc-list.el.
 
+Brent Goodrick <bgoodr AT gmail.com>:
+  * Fixed a bug in erc-dcc-send-sentinel.
+
 ----
 
 P.S.: Many people contributed small bits to ERC whose names I probably
diff --git a/ChangeLog b/ChangeLog
index 6f9d7ef..124e1a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,10 @@
        display their test messages.
        (erc-auto-query): Add explanatory :tag for nil choice.
 
+       * erc-dcc.el (erc-dcc-send-sentinel): Better handle case where elt
+       is nil, in order to avoid an error.  Thanks to Brent Goodrick for
+       the initial patch.
+
        * erc-networks.el (erc-server-alist): Add Rizon network.
 
        * erc-services.el (erc-nickserv-passwords): Add Rizon to options.
diff --git a/erc-dcc.el b/erc-dcc.el
index 8158c09..146d36c 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -762,14 +762,14 @@ listening port."
   (erc-extract-nick (plist-get plist :nick)))
 
 (defun erc-dcc-send-sentinel (proc event)
-  (let* ((elt (erc-dcc-member :peer proc))
-         (buf (marker-buffer (plist-get elt :sent))))
+  (let* ((elt (erc-dcc-member :peer proc)))
     (cond
      ((string-match "^open from " event)
       (when elt
-        (with-current-buffer buf
-          (set-process-buffer proc buf)
-          (setq erc-dcc-entry-data elt))
+        (let ((buf (marker-buffer (plist-get elt :sent))))
+          (with-current-buffer buf
+            (set-process-buffer proc buf)
+            (setq erc-dcc-entry-data elt)))
         (run-hook-with-args 'erc-dcc-send-connect-hook proc))))))
 
 (defun erc-dcc-find-file (file)