* gnus-registry.el (gnus-registry-store-extra-entry): Use

gnus-assq-delete-all.

* gnus-xmas.el (gnus-xmas-assq-delete-all): New function.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c2b338..ce64840 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2003-05-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * gnus-registry.el (gnus-registry-store-extra-entry): Use
+       gnus-assq-delete-all. 
+
+       * gnus-xmas.el (gnus-xmas-assq-delete-all): New function.
+
        * message.el (message-ignored-bounced-headers): Add Delivered-To. 
 
        * gnus-sum.el (gnus-summary-find-next): Indent.

diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index 606317c..e97b1e4 100644 (file)
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -300,7 +300,7 @@ The message must have at least one group name."
   "Put a specific entry in the extras field of the registry entry for id."
   (let* ((extra (gnus-registry-fetch-extra id))
         (alist (cons (cons key value)
-                (assq-delete-all key (gnus-registry-fetch-extra id)))))
+                (gnus-assq-delete-all key (gnus-registry-fetch-extra id)))))
     (gnus-registry-store-extra id alist)))
 
 (defun gnus-registry-fetch-group (id)

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 9225a5a..a01366a 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -390,6 +390,7 @@ call it with the value of the `gnus-data' text property."
   (defalias 'gnus-put-text-property 'gnus-xmas-put-text-property)
   (defalias 'gnus-deactivate-mark 'ignore)
   (defalias 'gnus-window-edges 'window-pixel-edges)
+  (defalias 'gnus-assq-delete-all 'gnus-xmas-assq-delete-all)
 
   (if (and (<= emacs-major-version 19)
           (< emacs-minor-version 14))
@@ -885,6 +886,12 @@ Warning: Don't insert text immediately after the image."
       `(open-network-stream ,name ,buffer ,host ,service ,protocol)
     `(open-network-stream ,name ,buffer ,host ,service)))
 
+(defun gnus-xmas-assq-delete-all (key alist)
+  (let ((elem nil))
+    (while (setq elem (assq key alist))
+      (setq alist (delq elem alist)))
+    alist))
+
 (provide 'gnus-xmas)
 
 ;;; gnus-xmas.el ends here

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 18a911b..672c0d2 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -319,6 +319,7 @@ be set in `.emacs' instead."
   (defalias 'gnus-appt-select-lowest-window 'appt-select-lowest-window)
   (defalias 'gnus-mail-strip-quoted-names 'mail-strip-quoted-names)
   (defalias 'gnus-character-to-event 'identity)
+  (defalias 'gnus-assq-delete-all 'assq-delete-all)
   (defalias 'gnus-add-text-properties 'add-text-properties)
   (defalias 'gnus-put-text-property 'put-text-property)
   (defvar gnus-mode-line-image-cache t)