gnus-ems.el: Make process-plist functions work.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 00c723444fe01ab7377dc2307179e3f5de28f9fa..2ce91eedc3e6c0a768c2a32e5f5eaab9b249d5c2 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-ems.el (gnus-set-process-plist, gnus-process-plist): Change name
+       of symbol that holds plist data.
+       (gnus-process-plist): Remove plist of process after getting it.
+
 2010-09-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * message.el (message-generate-hashcash): Change default to

diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index b4b37945c1da43141613026d1ea03ab0b1645177..7bc59bf1b69efb7ef01cccbb2e55b19ecf15c8ae 100644 (file)
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -314,24 +314,31 @@
        (defalias 'gnus-process-put 'process-put))
     (defun gnus-set-process-plist (process plist)
       "Replace the plist of PROCESS with PLIST.  Returns PLIST."
-      (put 'gnus-process-plist process plist))
+      (put 'gnus-process-plist-internal process plist))
+
     (defun gnus-process-plist (process)
       "Return the plist of PROCESS."
-      ;; Remove those of dead processes from `gnus-process-plist'
-      ;; to prevent it from growing.
-      (let ((plist (symbol-plist 'gnus-process-plist))
-           proc)
-       (while (setq proc (car plist))
-         (if (and (processp proc)
-                  (memq (process-status proc) '(open run)))
-             (setq plist (cddr plist))
-           (setcar plist (caddr plist))
-           (setcdr plist (or (cdddr plist) '(nil))))))
-      (get 'gnus-process-plist process))
+      ;; This form works but can't prevent the plist data from
+      ;; growing infinitely.
+      ;;(get 'gnus-process-plist-internal process)
+      (let* ((plist (symbol-plist 'gnus-process-plist-internal))
+            (tem (memq process plist)))
+       (prog1
+           (cadr tem)
+         ;; Remove it from the plist data.
+         (when tem
+           (if (eq plist tem)
+               (progn
+                 (setcar plist (caddr plist))
+                 (setcdr plist (or (cdddr plist) '(nil))))
+             (setcdr (nthcdr (- (length plist) (length tem) 1) plist)
+                     (cddr tem)))))))
+
     (defun gnus-process-get (process propname)
       "Return the value of PROCESS' PROPNAME property.
 This is the last value stored with `(gnus-process-put PROCESS PROPNAME VALUE)'."
       (plist-get (gnus-process-plist process) propname))
+
     (defun gnus-process-put (process propname value)
       "Change PROCESS' PROPNAME property to VALUE.
 It can be retrieved with `(gnus-process-get PROCESS PROPNAME)'."