[SCM] emacs-jabber branch, master, updated. c98be9e194710ea6b36903ba0435450686243b10

[Evgenii T. <evg...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".

The branch, master has been updated
       via  c98be9e194710ea6b36903ba0435450686243b10 (commit)
      from  52368dc3424bc98e4abaa20df97176404b5ff98a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c98be9e194710ea6b36903ba0435450686243b10
Author: Evgenii Terechkov <ev...@al...>
Date:   Sun Apr 7 10:34:56 2013 +0800

    assoc.el is absoleted since 24.3. Dont use it.

diff --git a/jabber-muc-nick-coloring.el b/jabber-muc-nick-coloring.el
index 56fe358..5a7a171 100644
--- a/jabber-muc-nick-coloring.el
+++ b/jabber-muc-nick-coloring.el
@@ -1,6 +1,6 @@
 ;;; jabber-muc-nick-coloring.el --- Add nick coloring abilyty to emacs-jabber
 
-;; Copyright 2009, 2010, 2012 Terechkov Evgenii - ev...@al...
+;; Copyright 2009, 2010, 2012, 2013 Terechkov Evgenii - ev...@al...
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -33,7 +33,6 @@
           (require 'hexrgb)))
       (error
        "hexrgb not found in `load-path' or jabber-fallback-lib/ directory.")))
-(require 'assoc)                        ;we need aget/aput
 
 ;;;;##########################################################################
 ;;;;  User Options, Variables
@@ -73,13 +72,13 @@
 
 (defun jabber-muc-nick-get-color (nick)
   "Get NICKs color"
-  (let ((color (aget jabber-muc-participant-colors nick)))
+  (let ((color (cdr (assoc nick jabber-muc-participant-colors))))
     (if color
         color
       (progn
         (unless jabber-muc-participant-colors )
-        (aput 'jabber-muc-participant-colors nick (jabber-muc-nick-gen-color nick))
-        (aget jabber-muc-participant-colors nick)))))
+        (push (cons nick (jabber-muc-nick-gen-color nick)) jabber-muc-participant-colors)
+        (cdr (assoc nick jabber-muc-participant-colors))))))
 
 (provide 'jabber-muc-nick-coloring)
 
diff --git a/jabber-presence.el b/jabber-presence.el
index 83e2970..55325d2 100644
--- a/jabber-presence.el
+++ b/jabber-presence.el
@@ -27,8 +27,6 @@
 (require 'jabber-muc)
 (require 'jabber-autoloads)
 
-(require 'assoc)
-
 (defvar jabber-presence-element-functions nil
   "List of functions returning extra elements for <presence/> stanzas.
 Each function takes one argument, the connection, and returns a
@@ -314,7 +312,7 @@ CLOSURE-DATA should be 'initial if initial roster push, nil otherwise."
     ;; Ordinary presence, with no specified recipient
     (dolist (jc jabber-connections)
       (let ((subelements (jabber-presence-children jc)))
-	(aput 'subelements-map jc subelements)
+        (push (cons jc subelements) subelements-map)
 	(jabber-send-sexp-if-connected jc `(presence () ,@subelements))))
 
     ;; Then send presence to groupchats

-----------------------------------------------------------------------

Summary of changes:
 jabber-muc-nick-coloring.el |    9 ++++-----
 jabber-presence.el          |    4 +---
 2 files changed, 5 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
emacs-jabber