From: ueno <ueno>
Date: Mon, 23 Oct 2006 08:21:22 +0000 (+0000)
Subject: Don't use NOERROR arg of require.
X-Git-Tag: cache-file-branchpoint~52
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41258e11e9ed88f8762e33d9f059692282d46bc7;p=elisp%2Fmixi.git

Don't use NOERROR arg of require.
---

diff --git a/ChangeLog b/ChangeLog
index 71c3a97..3b0694c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2006-10-23  Daiki Ueno  <ueno@unixuser.org>
 
 	* mixi.el (mixi-curl-retrieve): New function.
+	(mixi-retrieve-function): Don't use NOERROR arg of require.
 
 2006-10-23  OHASHI Akira  <bg66@koka-in.org>
 
diff --git a/mixi.el b/mixi.el
index 4027a73..403be0a 100644
--- a/mixi.el
+++ b/mixi.el
@@ -98,8 +98,14 @@
 
 ;;; Code:
 
-(require 'url "url" t)
-(require 'w3m "w3m" t)
+(condition-case nil
+    (require 'url "url")
+  (error))
+
+(condition-case nil
+    (require 'w3m "w3m")
+  (error))
+
 (eval-when-compile (require 'cl))
 
 (defgroup mixi nil
@@ -117,12 +123,12 @@
   :group 'mixi)
 
 (defcustom mixi-retrieve-function
-  (if (and (require 'url "url" t)
-	   (fboundp 'url-retrieve-synchronously))
+  (if (fboundp 'url-retrieve-synchronously)
       'mixi-w3-retrieve 'mixi-w3m-retrieve)
   "*The function for retrieving."
   :type '(choice (const :tag "Using w3" mixi-w3-retrieve)
 		 (const :tag "Using w3m" mixi-w3m-retrieve)
+		 (const :tag "Using curl" mixi-curl-retrieve)
 		 (function :format "Other function: %v\n" :size 0))
   :group 'mixi)