* mixi.el (mixi-url-retrieve): Rename from `mixi-w3-retrieve'.

(mixi-retrieve-function): Follow the change above.

diff --git a/ChangeLog b/ChangeLog
index 0fde3cf..cddf310 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-23  OHASHI Akira  <bg66@koka-in.org>
+
+       * mixi.el (mixi-url-retrieve): Rename from `mixi-w3-retrieve'.
+       (mixi-retrieve-function): Follow the change above.
+
 2006-11-22  OHASHI Akira  <bg66@koka-in.org>
 
        * mixi.el (mixi-w3-retrieve): Use `decode-coding-string' instead of

diff --git a/mixi.el b/mixi.el
index 8240074..3ca6c39 100644 (file)
--- a/mixi.el
+++ b/mixi.el
@@ -136,7 +136,7 @@
          (progn
            (require 'url)
            (if (fboundp 'url-retrieve-synchronously)
-               'mixi-w3-retrieve))
+               'mixi-url-retrieve))
        (error))
       (condition-case nil
          (progn
@@ -148,7 +148,7 @@
          'mixi-curl-retrieve)
       (error "Can't set `mixi-retrieve-function'"))
   "*The function for retrieving."
-  :type '(radio (const :tag "Using w3" mixi-w3-retrieve)
+  :type '(radio (const :tag "Using url" mixi-url-retrieve)
                (const :tag "Using w3m" mixi-w3m-retrieve)
                (const :tag "Using curl" mixi-curl-retrieve)
                (function :format "Other function: %v\n" :size 0))
@@ -231,7 +231,7 @@ Increase this value when unexpected error frequently occurs."
        ,url
      (concat mixi-url ,url)))
 
-(defun mixi-w3-retrieve (url &optional post-data)
+(defun mixi-url-retrieve (url &optional post-data)
   "Retrieve the URL and return gotten strings."
   (if post-data
       (progn
@@ -249,8 +249,8 @@ Increase this value when unexpected error frequently occurs."
       (if (re-search-forward "HTTP/[0-9.]+ 302 Moved" nil t)
          (if (re-search-forward
               (concat "Location: " mixi-url "\\(.+\\)") nil t)
-             (setq ret (mixi-w3-retrieve (match-string 1) post-data))
-           (setq ret (mixi-w3-retrieve "/home.pl" post-data)))
+             (setq ret (mixi-url-retrieve (match-string 1) post-data))
+           (setq ret (mixi-url-retrieve "/home.pl" post-data)))
        (unless (re-search-forward "HTTP/[0-9.]+ 200 OK" nil t)
          (error (mixi-message "Cannot retrieve")))
        (search-forward "\n\n")