Rename `gnus-pull' to `gnus-alist-pull'.

* gnus-demon.el (gnus-demon-remove-handler): Use it.

* gnus-demon.el (gnus-demon-remove-handler): Use it.

* gnus-group.el (gnus-group-make-web-group): Use it.

* gnus-msg.el (gnus-setup-message): Use it.

* gnus-sum.el (gnus-mark-article-as-unread)
(gnus-summary-mark-article-as-unread, gnus-summary-remove-bookmark)
(gnus-summary-set-bookmark): Use it.

* gnus-util.el (gnus-alist-pull): Rename `gnus-pull'.

* gnus.el (gnus-group-remove-parameter): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e41f763..3a2619c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,21 @@
 2010-10-08  Teodor Zlatanov  <tzz@lifelogs.com>
 
+       * gnus-util.el (gnus-alist-pull): Rename `gnus-pull'.
+
+       * gnus-sum.el (gnus-mark-article-as-unread)
+       (gnus-summary-mark-article-as-unread, gnus-summary-remove-bookmark)
+       (gnus-summary-set-bookmark): Use it.
+
+       * gnus-msg.el (gnus-setup-message): Use it.
+
+       * gnus-demon.el (gnus-demon-remove-handler): Use it.
+
+       * gnus.el (gnus-group-remove-parameter): Use it.
+
+       * gnus-group.el (gnus-group-make-web-group): Use it.
+
+       * gnus-demon.el (gnus-demon-remove-handler): Use it.
+
        * nnregistry.el: Update docs to mention manual.
 
        * gnus-registry.el: Update docs to mention nnregistry.el.

diff --git a/lisp/gnus-demon.el b/lisp/gnus-demon.el
index c4e439c..9f992d5 100644 (file)
--- a/lisp/gnus-demon.el
+++ b/lisp/gnus-demon.el
@@ -92,7 +92,7 @@ time Emacs has been idle for IDLE `gnus-demon-timestep's."
 
 (defun gnus-demon-remove-handler (function &optional no-init)
   "Remove the handler FUNCTION from the list of handlers."
-  (gnus-pull function gnus-demon-handlers)
+  (gnus-alist-pull function gnus-demon-handlers)
   (unless no-init
     (gnus-demon-init)))
 

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index b228556..b92b608 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -3027,7 +3027,7 @@ If SOLID (the prefix), create a solid group."
                  (nnweb-ephemeral-p t))))
     (if solid
        (progn
-         (gnus-pull 'nnweb-ephemeral-p method)
+         (gnus-alist-pull 'nnweb-ephemeral-p method)
          (gnus-group-make-group group method))
       (gnus-group-read-ephemeral-group
        group method t

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 891718e..a3c5112 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -420,7 +420,7 @@ Thank you for your help in stamping out bugs.
                     ;; There may be an old " *gnus article copy*" buffer.
                     (let (gnus-article-copy)
                       (gnus-configure-posting-styles ,group)))))
-       (gnus-pull ',(intern gnus-draft-meta-information-header)
+       (gnus-alist-pull ',(intern gnus-draft-meta-information-header)
                  message-required-headers)
        (when (and ,group
                  (not (string= ,group "")))

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index c45536c..a056690 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -10528,7 +10528,7 @@ ARTICLE can also be a list of articles."
            (not (equal gnus-newsgroup-name (car gnus-article-current))))
     (error "No current article selected"))
   ;; Remove old bookmark, if one exists.
-  (gnus-pull article gnus-newsgroup-bookmarks)
+  (gnus-alist-pull article gnus-newsgroup-bookmarks)
   ;; Set the new bookmark, which is on the form
   ;; (article-number . line-number-in-body).
   (push
@@ -10549,7 +10549,7 @@ ARTICLE can also be a list of articles."
   ;; Remove old bookmark, if one exists.
   (if (not (assq article gnus-newsgroup-bookmarks))
       (gnus-message 6 "No bookmark in current article.")
-    (gnus-pull article gnus-newsgroup-bookmarks)
+    (gnus-alist-pull article gnus-newsgroup-bookmarks)
     (gnus-message 6 "Removed bookmark.")))
 
 ;; Suggested by Daniel Quinlan <quinlan@best.com>.
@@ -10675,7 +10675,7 @@ If NO-EXPIRE, auto-expiry will be inhibited."
               (setq gnus-newsgroup-unreads
                     (gnus-add-to-sorted-list gnus-newsgroup-unreads
                                              article))))
-       (gnus-pull article gnus-newsgroup-reads)
+       (gnus-alist-pull article gnus-newsgroup-reads)
 
        ;; See whether the article is to be put in the cache.
        (and gnus-use-cache
@@ -10849,7 +10849,7 @@ If NO-EXPIRE, auto-expiry will be inhibited."
            (t
             (setq gnus-newsgroup-unreads
                   (gnus-add-to-sorted-list gnus-newsgroup-unreads article))))
-      (gnus-pull article gnus-newsgroup-reads)
+      (gnus-alist-pull article gnus-newsgroup-reads)
       t)))
 
 (defalias 'gnus-summary-mark-as-unread-forward

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 932b0a1..503ec47 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -1366,7 +1366,7 @@ Return the modified alist."
        (when (string-match r word)
          (throw 'found r))))))
 
-(defmacro gnus-pull (key alist &optional assoc-p)
+(defmacro gnus-alist-pull (key alist &optional assoc-p)
   "Modify ALIST to be without KEY."
   (unless (symbolp alist)
     (error "Not a symbol: %s" alist))

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 4dbfb19..6f80bcd 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -3943,7 +3943,7 @@ If ALLOW-LIST, also allow list as a result."
        (when params
          (setq params (delq name params))
          (while (assq name params)
-           (gnus-pull name params))
+           (gnus-alist-pull name params))
          (gnus-info-set-params info params))))))
 
 (defun gnus-group-add-score (group &optional score)

diff --git a/lisp/nndoc.el b/lisp/nndoc.el
index 46d775a..6c9ef1c 100644 (file)
--- a/lisp/nndoc.el
+++ b/lisp/nndoc.el
@@ -1038,7 +1038,7 @@ as the last checked definition, if t or `first', add as the
 first definition, and if any other symbol, add after that
 symbol in the alist."
   ;; First remove any old instances.
-  (gnus-pull (car definition) nndoc-type-alist)
+  (gnus-alist-pull (car definition) nndoc-type-alist)
   ;; Then enter the new definition in the proper place.
   (cond
    ((or (null position) (eq position 'last))

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index 1cfa7a4..ac643f9 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -207,7 +207,7 @@ Valid types include `google', `dejanews', and `gmane'.")
 
 (deffoo nnweb-request-delete-group (group &optional force server)
   (nnweb-possibly-change-server group server)
-  (gnus-pull group nnweb-group-alist t)
+  (gnus-alist-pull group nnweb-group-alist t)
   (nnweb-write-active)
   (gnus-delete-file (nnweb-overview-file group))
   t)