Re: asked twice for unsafe links

[Katsumi Yamaoka <yamaoka@xxxxxxx>]

In [emacs-w3m : No.11240] jidanni@xxxxxxxxxxx wrote:
> Why in gnus when we see
>     This link is considered to be unsafe; use the prefix arg to view anyway
> and then use a prefix, we are still then again asked "yes or no"?
> I use http://jidanni.org/comp/configuration/

The query logic of the function seems to have been crazy.  Thanks
for pointing it out.  I've installed the fix.  The diff:

--- w3m.el~	2010-06-24 07:53:17 +0000
+++ w3m.el	2010-06-25 05:10:18 +0000
@@ -3994,12 +3994,9 @@
 			 (or end (point-max))))
 		    (setq safe-regexp
 			  (get-text-property (point) 'w3m-safe-url-regexp))
-		    (if (or (not safe-regexp)
-			    (string-match safe-regexp url)
-			    (and force
-				 (or (not (interactive-p))
-				     (yes-or-no-p "\
-Are you sure you really want to show this image (maybe insecure)? "))))
+		    (if (or force
+			    (not safe-regexp)
+			    (string-match safe-regexp url))
 			(w3m-toggle-inline-images-internal
 			 status no-cache url
 			 (or begin (point-min))
@@ -4061,13 +4058,10 @@
 	     (setq pos (next-single-property-change pos 'w3m-image
 						    nil end)))
 	   t))))
-    (if (or status
+    (if (or force
+	    status
 	    (not safe-regexp)
-	    safe-p
-	    (and force
-		 (or (not (interactive-p))
-		     (yes-or-no-p "\
-Are you sure you really want to show all images (maybe insecure)? "))))
+	    safe-p)
 	(progn
 	  (unwind-protect
 	      (w3m-toggle-inline-images-internal (if status 'on 'off)