[PATCH] Re: Emacspeak passing a #<buffer> rather than string as URL base

[Jason Riedy <jason@xxxxxxx>]

And I write:
> I'm trying to use Emacspeak's Google Reader interface, but
> somewhere its passing a buffer reference for a URL base rather
> than a string.

The appended patch works around the problem for now.  Other aspects
appear to bust (e.g. links generally don't appear to work correctly),
but I'm changing how I skim feeds, so I'm not investigating further.

Jason
--
RCS file: /storage/cvsroot/emacs-w3m/w3m-util.el,v
retrieving revision 1.121
diff -u -r1.121 w3m-util.el
--- w3m-util.el 20 Dec 2007 07:39:52 -0000      1.121
+++ w3m-util.el 16 Apr 2008 23:42:34 -0000
@@ -809,7 +809,9 @@
      (condition-case nil
         (string-match w3m-url-components-regexp string)
        (error ;; Stack overflow in regexp matcher
-       (w3m-string-match-url-components-1 string)))))
+        (condition-case nil
+            (w3m-string-match-url-components-1 string)
+          (error nil))))))

 (defsubst w3m-time-newer-p (a b)
   "Return t, if A is newer than B.  Otherwise return nil.
Index: w3m.el
===================================================================
RCS file: /storage/cvsroot/emacs-w3m/w3m.el,v
retrieving revision 1.1353
diff -u -r1.1353 w3m.el
--- w3m.el      15 Apr 2008 03:06:47 -0000      1.1353
+++ w3m.el      16 Apr 2008 23:42:39 -0000
@@ -6187,9 +6187,10 @@
       (concat (substring base 0 (match-end 5)) url))
      (t
       ;; URL has only a fragment part.
-      (w3m-string-match-url-components base)
-      (concat (substring base 0 (match-beginning 8))
-             url)))))
+      (if (w3m-string-match-url-components base)
+          (concat (substring base 0 (match-beginning 8))
+                  url)
+        url)))))

 (defun w3m-display-progress-message (url)
   "Show \"Reading URL...\" message in the middle of a buffer."