aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-07-08 14:45:36 +0000
committerJuanma Barranquero2008-07-08 14:45:36 +0000
commitdb6003fb80e1bcf9fa6b1b2d86f208eb1d2f5045 (patch)
tree7a80d4c2ad6c96d0904e33ef6540b857dea700c1
parent85cf8992283c76c866535e65757a35be00cd244d (diff)
downloademacs-db6003fb80e1bcf9fa6b1b2d86f208eb1d2f5045.tar.gz
emacs-db6003fb80e1bcf9fa6b1b2d86f208eb1d2f5045.zip
* net/browse-url.el (browse-url-default-browser): Fix argument list in lambda.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/browse-url.el10
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1501cda13d8..d985685dbc4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-07-08 Eduard Wiebe <usenet@pusto.de> (tiny change)
2
3 * net/browse-url.el (browse-url-default-browser):
4 Fix argument list in lambda.
5
12008-07-07 Ulf Jasper <ulf@web.de> 62008-07-07 Ulf Jasper <ulf@web.de>
2 7
3 * net/newst-backend.el (newsticker--get-news-by-url): Catch errors 8 * net/newst-backend.el (newsticker--get-news-by-url): Catch errors
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index f41e4ac67fa..9fdd08501e0 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -500,7 +500,7 @@ enabled. The port number should be set in `browse-url-CCI-port'."
500 500
501(defvar browse-url-temp-file-name nil) 501(defvar browse-url-temp-file-name nil)
502(make-variable-buffer-local 'browse-url-temp-file-name) 502(make-variable-buffer-local 'browse-url-temp-file-name)
503 503
504(defcustom browse-url-xterm-program "xterm" 504(defcustom browse-url-xterm-program "xterm"
505 "The name of the terminal emulator used by `browse-url-text-xterm'. 505 "The name of the terminal emulator used by `browse-url-text-xterm'.
506This might, for instance, be a separate color version of xterm." 506This might, for instance, be a separate color version of xterm."
@@ -886,7 +886,7 @@ Galeon, Konqueror, Netscape, Mosaic, Lynx in an xterm, and then W3."
886 ((executable-find browse-url-xterm-program) 'browse-url-text-xterm) 886 ((executable-find browse-url-xterm-program) 'browse-url-text-xterm)
887 ((locate-library "w3") 'browse-url-w3) 887 ((locate-library "w3") 'browse-url-w3)
888 (t 888 (t
889 (lambda (&ignore args) (error "No usable browser found")))) 889 (lambda (&rest ignore) (error "No usable browser found"))))
890 url args)) 890 url args))
891 891
892;;;###autoload 892;;;###autoload
@@ -1322,7 +1322,7 @@ The `browse-url-gnudoit-program' program is used with options given by
1322(defun browse-url-text-xterm (url &optional new-window) 1322(defun browse-url-text-xterm (url &optional new-window)
1323 ;; new-window ignored 1323 ;; new-window ignored
1324 "Ask a text browser to load URL. 1324 "Ask a text browser to load URL.
1325URL defaults to the URL around or before point. 1325URL defaults to the URL around or before point.
1326This runs the text browser specified by `browse-url-text-browser'. 1326This runs the text browser specified by `browse-url-text-browser'.
1327in an Xterm window using the Xterm program named by `browse-url-xterm-program' 1327in an Xterm window using the Xterm program named by `browse-url-xterm-program'
1328with possible additional arguments `browse-url-xterm-args'." 1328with possible additional arguments `browse-url-xterm-args'."
@@ -1337,7 +1337,7 @@ with possible additional arguments `browse-url-xterm-args'."
1337;;;###autoload 1337;;;###autoload
1338(defun browse-url-text-emacs (url &optional new-buffer) 1338(defun browse-url-text-emacs (url &optional new-buffer)
1339 "Ask a text browser to load URL. 1339 "Ask a text browser to load URL.
1340URL defaults to the URL around or before point. 1340URL defaults to the URL around or before point.
1341This runs the text browser specified by `browse-url-text-browser'. 1341This runs the text browser specified by `browse-url-text-browser'.
1342With a prefix argument, it runs a new browser process in a new buffer. 1342With a prefix argument, it runs a new browser process in a new buffer.
1343 1343
@@ -1469,7 +1469,7 @@ Default to the URL around or before point."
1469 1469
1470(defun browse-url-elinks-new-window (url) 1470(defun browse-url-elinks-new-window (url)
1471 "Ask the Elinks WWW browser to load URL in a new window." 1471 "Ask the Elinks WWW browser to load URL in a new window."
1472 (let ((process-environment (browse-url-process-environment))) 1472 (let ((process-environment (browse-url-process-environment)))
1473 (apply #'start-process 1473 (apply #'start-process
1474 (append (list (concat "elinks:" url) 1474 (append (list (concat "elinks:" url)
1475 nil) 1475 nil)