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

[mwolson]

commit 9c194fd2a887e645275ca3e11cd13defa5f9b35f
Author: Michael Olson <address@hidden>
Date:   Mon Mar 6 01:33:01 2006 +0000

    Update from CVS
    
    2006-02-28  Diane Murray  <address@hidden>
    
       * erc-capab.el: Removed things that were accidentally committed on
       2006-02-20.  Removed Todo section.
       (erc-capab-unidentified): Removed.
    git-archimport-id: address@hidden/erc--cvs--0--patch-135

diff --git a/ChangeLog b/ChangeLog
index 26162a4..7471b1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-28  Diane Murray  <address@hidden>
+
+       * erc-capab.el: Removed things that were accidentally committed on
+       2006-02-20.  Removed Todo section.
+       (erc-capab-unidentified): Removed.
+
 2006-02-26  Michael Olson  <address@hidden>
 
        * erc-capab.el: Use (eval-when-compile (require 'cl)).
diff --git a/erc-capab.el b/erc-capab.el
index 191643c..a857ef3 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -61,20 +61,12 @@
 ;; `erc-capab-identify-disable'), no prefix will be inserted, but the
 ;; flag sent by the server will still be stripped.
 
-;;; 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)
 (eval-when-compile (require 'cl))
 
-(defconst erc-capab-version "$Revision: 1.9 $"
+(defconst erc-capab-version "$Revision: 1.10 $"
   "ERC CAPAB revision number.")
 
 ;;; Customization:
@@ -88,11 +80,6 @@
   :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."
-  :group 'erc-faces)
-
 ;;; Define module:
 
 (define-erc-response-handler (290)