[Erc-commit] [commit][emacs22] Update from CVS

[mwolson]

commit 47304d40f65acabdd39ecbb252338483dfda049b
Author: Michael Olson <address@hidden>
Date:   Thu Feb 23 23:19:45 2006 +0000

    Update from CVS
    
    2006-02-20  Diane Murray  <address@hidden>
    
       * erc-capab.el (erc-capab-send-identify-messages): Fixed comment
       to explain thoughts better.  `erc-server-parameters' is an
       associated list when it's set, not a string.
    git-archimport-id: address@hidden/erc--cvs--0--patch-130

diff --git a/ChangeLog b/ChangeLog
index cc80019..d9b2875 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-20  Diane Murray  <address@hidden>
+
+       * erc-capab.el (erc-capab-send-identify-messages): Fixed comment
+       to explain thoughts better.  `erc-server-parameters' is an
+       associated list when it's set, not a string.
+
 2006-02-19  Michael Olson  <address@hidden>
 
        * erc-capab.el (erc-capab-send-identify-messages): Make sure some
diff --git a/erc-capab.el b/erc-capab.el
index 15ca9fd..36802f3 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -63,11 +63,17 @@
 
 ;;; Todo:
 
+;; DSM check in modify hook if we should mark, then mark appropriately
+;;     `erc-capab-identify-add-prefix'
+;;     and/or
+;;     `erc-capab-identify-apply-face'
+;; DSM CTCP has `erc-identified' but not `erc-parsed' so can't find out 
nickname?...
+
 ;;; Code:
 
 (require 'erc)
 
-(defconst erc-capab-version "$Revision: 1.6 $"
+(defconst erc-capab-version "$Revision: 1.7 $"
   "ERC CAPAB revision number.")
 
 ;;; Customization:
@@ -81,6 +87,10 @@
   :group 'erc-capab
   :type '(choice string (const nil)))
 
+(defface erc-capab-unidentified
+  '((t :inherit highlight))
+  "Face for displaying users who haven't identified with NickServ.")
+
 ;;; Define module:
 
 (define-erc-response-handler (290)
@@ -134,9 +144,9 @@ These arguments are sent to this function when called as a 
hook in
   "Send CAPAB IDENTIFY messages if the server supports it."
   (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)
+             ;; could possibly check for '("IRCD" . "dancer") in
+             ;; `erc-server-parameters' instead of looking for a specific name
+             ;; in `erc-server-version'
              (assoc "CAPAB" erc-server-parameters))
     (erc-log "Sending CAPAB IDENTIFY-MSG and IDENTIFY-CTCP")
     (erc-server-send "CAPAB IDENTIFY-MSG")