(elmo-net-folder-set-parameters): Rename argument

`tokens' to `params'.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 76b0686..03749ea 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-09  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo-net.el (elmo-net-folder-set-parameters): Rename argument
+       `tokens' to `params'.
+

 2005-10-13  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo-split.el (elmo-split-subr): Disable multibyte characters of
 2005-10-13  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo-split.el (elmo-split-subr): Disable multibyte characters of

diff --git a/elmo/elmo-net.el b/elmo/elmo-net.el
index 1dcb4f7..cd230a6 100644 (file)
--- a/elmo/elmo-net.el
+++ b/elmo/elmo-net.el
@@ -314,13 +314,13 @@ Returned value is searched from `elmo-network-stream-type-alist'."
       (setq alist (cdr alist)))
     spec))
 
       (setq alist (cdr alist)))
     spec))
 

-(defun elmo-net-folder-set-parameters (folder tokens &optional defaults)
-  (let ((port (cdr (assq 'port tokens)))
-       (stream-type (cdr (assq 'stream-type tokens))))
+(defun elmo-net-folder-set-parameters (folder params &optional defaults)
+  (let ((port (cdr (assq 'port params)))
+       (stream-type (cdr (assq 'stream-type params))))

     ;; server
     (elmo-net-folder-set-server-internal
      folder
     ;; server
     (elmo-net-folder-set-server-internal
      folder

-     (or (cdr (assq 'server tokens))
+     (or (cdr (assq 'server params))

         (plist-get defaults :server)))
     ;; port
     (elmo-net-folder-set-port-internal
         (plist-get defaults :server)))
     ;; port
     (elmo-net-folder-set-port-internal

@@ -330,8 +330,8 @@ Returned value is searched from `elmo-network-stream-type-alist'."
     ;; stream-type
     (elmo-net-folder-set-stream-type-internal
      folder
     ;; stream-type
     (elmo-net-folder-set-stream-type-internal
      folder

-     (or (and stream-type (assoc (concat "!" stream-type)
-                                elmo-network-stream-type-alist))
+     (or (and stream-type
+             (assoc (concat "!" stream-type) elmo-network-stream-type-alist))

         (plist-get defaults :stream-type)))))
 
 (luna-define-method elmo-folder-initialize ((folder elmo-net-folder) name)
         (plist-get defaults :stream-type)))))
 
 (luna-define-method elmo-folder-initialize ((folder elmo-net-folder) name)