(browse-url-default-browser): Signal an error if no usable browser can

be found, rather than try to load w3.

2 files changed, 9 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7872c490a0b..8f22f75f15c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-19  Romain Francoise  <romain@orebokech.com>
+
+        * net/browse-url.el (browse-url-default-browser): Signal an error
+        if no usable browser can be found, rather than try to load w3.
+
 2005-11-16  Ryan Yeske  <rcyeske@gmail.com>
 
         * net/rcirc.el (rcirc-mangle-text): Add bold face property without
@@ -82,7 +87,7 @@
         * progmodes/gdb-ui.el (gdb-ann3): ...here.  Make it work in the
         speedbar.
         (gdb-find-watch-expression): New function.
-        
+
 2005-11-17  Chong Yidong  <cyd@stupidchicken.com>
 
         * faces.el (face-attribute, set-face-attribute): Mention existence
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 54fddf9261c..8d57bb30c11 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -864,7 +864,9 @@ xterm, MMM, and then W3."
      ((executable-find "tellw3b") 'browse-url-iximosaic)
      ((executable-find browse-url-xterm-program) 'browse-url-lynx-xterm)
      ((executable-find "mmm") 'browse-url-mmm)
-     (t 'browse-url-w3))
+     ((locate-library "w3") 'browse-url-w3)
+     (t
+      (lambda (&ignore args) (error "No usable browser found"))))
      url args))
 
 ;;;###autoload