X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-net.el;h=7abbd79fcb6a44861bfafc865485f6cb1eba1699;hb=2398b1df142250be96cc582d7ec4fc2d7de17601;hp=c1f1bdb57e1ad7bf930a80245557ff612147ebaa;hpb=4a0dcf872c6d3963b7d4ed1cc6242d1a31dbbf9c;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-net.el b/elmo/elmo-net.el
index c1f1bdb..7abbd79 100644
--- a/elmo/elmo-net.el
+++ b/elmo/elmo-net.el
@@ -26,6 +26,8 @@
 ;;; Commentary:
 ;;
 
+;;; Code:
+;;
 (eval-when-compile (require 'cl))
 
 (require 'elmo-util)
@@ -34,9 +36,6 @@
 (require 'elmo-cache)
 (require 'elmo)
 
-;;; Code:
-;;
-
 (defconst elmo-net-folder-name-syntax '((?@ [server ".+"])
 					(?: [port "^[0-9]+$"])
 					(?! stream-type)))
@@ -121,16 +120,16 @@ If nil, just once. If t, until success."
     (delete-process (elmo-network-session-process-internal session))))
 
 (defmacro elmo-network-stream-type-spec-string (stream-type)
-  (` (nth 0 (, stream-type))))
+  `(nth 0 ,stream-type))
 
 (defmacro elmo-network-stream-type-symbol (stream-type)
-  (` (nth 1 (, stream-type))))
+  `(nth 1 ,stream-type))
 
 (defmacro elmo-network-stream-type-feature (stream-type)
-  (` (nth 2 (, stream-type))))
+  `(nth 2 ,stream-type))
 
 (defmacro elmo-network-stream-type-function (stream-type)
-  (` (nth 3 (, stream-type))))
+  `(nth 3 ,stream-type))
 
 (defsubst elmo-network-session-password-key (session)
   (format "%s:%s/%s@%s:%d"
@@ -175,8 +174,7 @@ If nil, just once. If t, until success."
 
 (defmacro elmo-network-session-buffer (session)
   "Get buffer for SESSION."
-  (` (process-buffer (elmo-network-session-process-internal
-		      (, session)))))
+  `(process-buffer (elmo-network-session-process-internal ,session)))
 
 (defun elmo-network-get-session (class name folder &optional if-exists)
   "Get network session from session cache or a new network session.
@@ -352,7 +350,7 @@ Returned value is searched from `elmo-network-stream-type-alist'."
     ;; port
     (elmo-net-folder-set-port-internal
      folder
-     (or (and port (string-to-int port))
+     (or (and port (string-to-number port))
 	 (plist-get defaults :port)))
     ;; stream-type
     (elmo-net-folder-set-stream-type-internal