[Erc-commit] [commit][emacs22] Make sure parameters are strings before using them.

[mwolson]

commit 2988f9a58f263e0035001b1a2281c416516cc3fa
Author: Michael Olson <address@hidden>
Date:   Mon Feb 20 03:59:20 2006 +0000

    Make sure parameters are strings before using them.
    
    * erc-capab.el (erc-capab-send-identify-messages): Make sure some
      parameters are strings before using them.  Thanks to Alejandro Benitez
      for the report.
    git-archimport-id: address@hidden/erc--cvs--0--patch-126

diff --git a/ChangeLog b/ChangeLog
index 92cd064..3405fa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-19  Michael Olson  <address@hidden>
+
+       * erc-capab.el (erc-capab-send-identify-messages): Make sure some
+       parameters are strings before using them.  Thanks to Alejandro
+       Benitez for the report.
+
 2006-02-19  Diane Murray  <address@hidden>
 
        * erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
diff --git a/erc-capab.el b/erc-capab.el
index 6c753d5..7aea479 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -132,9 +132,11 @@ These arguments are sent to this function when called as a 
hook in
 
 (defun erc-capab-send-identify-messages ()
   "Send CAPAB IDENTIFY messages if the server supports it."
-  (when (and (string-match "^\\(dancer-ircd\\|hyperion\\)" erc-server-version)
+  (when (and (stringp erc-server-version)
+             (string-match "^\\(dancer-ircd\\|hyperion\\)" erc-server-version)
              ;; could possibly check for IRCD=dancer in `erc-server-parameters'
              ;; instead of looking for specific version names
+             (stringp erc-server-parameters)
              (assoc "CAPAB" erc-server-parameters))
     (erc-log "Sending CAPAB IDENTIFY-MSG and IDENTIFY-CTCP")
     (erc-server-send "CAPAB IDENTIFY-MSG")