[Erc-commit] [commit][emacs22] Add autoload for erc-capab-identify.

[mwolson]

commit c38f64fb7b9b092a5a7942b0edfe2f741d20d8d8
Author: Michael Olson <address@hidden>
Date:   Sat Feb 11 18:30:24 2006 +0000

    Add autoload for erc-capab-identify.
    
    * erc.el (erc-update-modules): Handle erc-capab-identify correctly.  Make
      some requirements shorter, so that it's easier to see why they are
      needed.
    
    * erc-capab.el: Add autoload cookie for capab-identify.
      (erc-capab-send-identify-messages, erc-capab-identify-activate): Minor
      whitespace fix in code.
    git-archimport-id: address@hidden/erc--cvs--0--patch-111

diff --git a/ChangeLog b/ChangeLog
index d42385f..d35067a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-11  Michael Olson  <address@hidden>
+
+       * erc.el (erc-update-modules): Handle erc-capab-identify
+       correctly.  Make some requirements shorter, so that it's easier to
+       see why they are needed.
+
+       * erc-capab.el: Add autoload cookie for capab-identify.
+       (erc-capab-send-identify-messages, erc-capab-identify-activate):
+       Minor whitespace fix in code.
+
 2006-02-11  Diane Murray  <address@hidden>
 
        * erc-list.el: Define `list' module which sets the alias
diff --git a/erc-capab.el b/erc-capab.el
index c77f989..9fb1ac9 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -63,9 +63,6 @@
 
 ;;; Todo:
 
-;; Somebody who knows about autoload cookies could please add them where
-;; necessary.
-
 ;;; Code:
 
 (require 'erc)
@@ -89,6 +86,7 @@
 (define-erc-response-handler (290)
   "Handle dancer-ircd CAPAB messages." nil nil)
 
+;;;###autoload (autoload 'erc-capab-identify-mode "erc-capab" nil t)
 (define-erc-module capab-identify nil
   "Handle dancer-ircd's CAPAB IDENTIFY-MSG and IDENTIFY-CTCP."
   ;; append so that `erc-server-parameters' is already set by `erc-server-005'
@@ -137,7 +135,7 @@ These arguments are sent to this function when called as a 
hook in
   (when (and (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
-            (assoc "CAPAB" erc-server-parameters))
+             (assoc "CAPAB" erc-server-parameters))
     (erc-log "Sending CAPAB IDENTIFY-MSG and IDENTIFY-CTCP")
     (erc-server-send "CAPAB IDENTIFY-MSG")
     (erc-server-send "CAPAB IDENTIFY-CTCP")
@@ -150,7 +148,7 @@ These arguments are sent to this function when called as a 
hook in
 PROC is the current server's process.
 PARSED is an `erc-parsed' response struct."
   (when (or (string= "IDENTIFY-MSG" (erc-response.contents parsed))
-           (string= "IDENTIFY-CTCP" (erc-response.contents parsed)))
+            (string= "IDENTIFY-CTCP" (erc-response.contents parsed)))
     (setq erc-capab-identify-activated t)
     (erc-display-message
      parsed 'notice 'active (format "%s activated"
diff --git a/erc.el b/erc.el
index 1a6d0a7..7a488d1 100644
--- a/erc.el
+++ b/erc.el
@@ -1798,15 +1798,14 @@ removed from the list will be disabled."
       (setq req (concat "erc-" (symbol-name mod)))
       (cond
        ;; yuck. perhaps we should bring the filenames into sync?
+       ((string= req "erc-capab-identify")
+       (setq req "erc-capab"))
        ((string= req "erc-completion")
-       (setq req "erc-pcomplete")
-       (setq mod 'completion))
+       (setq req "erc-pcomplete"))
        ((string= req "erc-pcomplete")
-       (setq req "erc-pcomplete")
        (setq mod 'completion))
        ((string= req "erc-autojoin")
-       (setq req "erc-join")
-       (setq mod 'autojoin)))
+       (setq req "erc-join")))
       (condition-case nil
          (require (intern req))
        (error nil))