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

[mwolson]

commit 141df54ee4984ebb120172652718ea47fd99b999
Author: Michael Olson <address@hidden>
Date:   Tue Apr 25 00:37:04 2006 +0000

    Update from CVS
    
    2006-04-18  Diane Murray  <address@hidden>
    
       * erc-pcomplete.el (pcomplete-erc-nicks): Added new optional
       argument IGNORE-SELF.  If this is non-nil, don't return the user's
       current nickname.  Doc fix.
       (pcomplete/erc-mode/complete-command): Don't complete the current
       nickname.
    git-archimport-id: address@hidden/erc--cvs--0--patch-155

diff --git a/ChangeLog b/ChangeLog
index cf57ab4..1e401b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-18  Diane Murray  <address@hidden>
+
+       * erc-pcomplete.el (pcomplete-erc-nicks): Added new optional
+       argument IGNORE-SELF.  If this is non-nil, don't return the user's
+       current nickname.  Doc fix.
+       (pcomplete/erc-mode/complete-command): Don't complete the current
+       nickname.
+
 2006-04-05  Diane Murray  <address@hidden>
 
        * erc.el (erc-cmd-SV): Removed the exclamation point.  Show the
diff --git a/erc-pcomplete.el b/erc-pcomplete.el
index 5dc7256..695138b 100644
--- a/erc-pcomplete.el
+++ b/erc-pcomplete.el
@@ -46,7 +46,7 @@
 (require 'time-date)
 (eval-when-compile (require 'cl))
 
-(defconst erc-pcomplete-version "$Revision: 1.34 $"
+(defconst erc-pcomplete-version "$Revision: 1.35 $"
   "ERC pcomplete mode revision")
 
 (defgroup erc-pcomplete nil
@@ -109,7 +109,7 @@ the most recent speakers are listed first."
   (pcomplete-here
    (append
     (pcomplete-erc-commands)
-    (pcomplete-erc-nicks erc-pcomplete-nick-postfix))))
+    (pcomplete-erc-nicks erc-pcomplete-nick-postfix t))))
 
 (defvar erc-pcomplete-ctcp-commands
   '("ACTION" "CLIENTINFO" "ECHO" "FINGER" "PING" "TIME" "USERINFO" "VERSION"))
@@ -215,13 +215,21 @@ the most recent speakers are listed first."
     not-ops))
 
 
-(defun pcomplete-erc-nicks (&optional postfix)
-  "Returns a list of nicks in the current channel."
-  (let ((users (erc-get-channel-user-list)))
-    (if erc-pcomplete-order-nickname-completions
-        (setq users (erc-sort-channel-users-by-activity users)))
-  (mapcar (lambda (x)
-              (concat (erc-server-user-nickname (car x)) postfix))
+(defun pcomplete-erc-nicks (&optional postfix ignore-self)
+  "Returns a list of nicks in the current channel.
+Optional argument POSTFIX is something to append to the nickname.
+If optional argument IGNORE-SELF is non-nil, don't return the current nick."
+  (let ((users (if erc-pcomplete-order-nickname-completions
+                   (erc-sort-channel-users-by-activity
+                    (erc-get-channel-user-list))
+                 (erc-get-channel-user-list))))
+    (mapcar (lambda (x)
+              (cond (ignore-self
+                     (if (string= (erc-server-user-nickname (car x))
+                                  (erc-current-nick))
+                         nil
+                       (concat (erc-server-user-nickname (car x)) postfix)))
+                    (t (concat (erc-server-user-nickname (car x)) postfix))))
             users)))
 
 (defun pcomplete-erc-all-nicks (&optional postfix)