aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1996-07-13 00:52:08 +0000
committerKarl Heuer1996-07-13 00:52:08 +0000
commit1f0c496bc5ddc4259731f04bd5d3c4e1d3906ac9 (patch)
treea291404b1e6f3f947dcdbf92eb688f34e8b44b48
parent39d1a2ce04c07f7dab3e615bad8efe7d5aefd62b (diff)
downloademacs-1f0c496bc5ddc4259731f04bd5d3c4e1d3906ac9.tar.gz
emacs-1f0c496bc5ddc4259731f04bd5d3c4e1d3906ac9.zip
(browse-url-netscape-program): New variable.
(browse-url-mosaic-program): New variable. (browse-url-mosaic, browse-url-netscape): Use them.
-rw-r--r--lisp/browse-url.el12
1 files changed, 9 insertions, 3 deletions
diff --git a/lisp/browse-url.el b/lisp/browse-url.el
index 97dfd36726c..445918632a6 100644
--- a/lisp/browse-url.el
+++ b/lisp/browse-url.el
@@ -266,6 +266,9 @@
266Used by the `browse-url-at-point', `browse-url-at-mouse', and 266Used by the `browse-url-at-point', `browse-url-at-mouse', and
267`browse-url-of-file' commands.") 267`browse-url-of-file' commands.")
268 268
269(defvar browse-url-netscape-program "netscape"
270 "*The name for invoking Netscape.")
271
269(defvar browse-url-netscape-arguments nil 272(defvar browse-url-netscape-arguments nil
270 "*A list of strings to pass to Netscape as arguments.") 273 "*A list of strings to pass to Netscape as arguments.")
271 274
@@ -275,6 +278,9 @@ Passing an interactive argument to \\[browse-url-netscape] or
275\\[browse-url-cci] reverses the effect of this variable. Requires 278\\[browse-url-cci] reverses the effect of this variable. Requires
276Netscape version 1.1N or later or XMosaic version 2.5 or later.") 279Netscape version 1.1N or later or XMosaic version 2.5 or later.")
277 280
281(defvar browse-url-mosaic-program "xmosaic"
282 "*The name for invoking Mosaic.")
283
278(defvar browse-url-mosaic-arguments nil 284(defvar browse-url-mosaic-arguments nil
279 "*A list of strings to pass to Mosaic as arguments.") 285 "*A list of strings to pass to Mosaic as arguments.")
280 286
@@ -487,7 +493,7 @@ used instead of browse-url-new-window-p."
487 (list (not (eq (null browse-url-new-window-p) 493 (list (not (eq (null browse-url-new-window-p)
488 (null current-prefix-arg)))))) 494 (null current-prefix-arg))))))
489 (let ((res 495 (let ((res
490 (apply 'call-process "netscape" nil nil nil 496 (apply 'call-process browse-url-netscape-program nil nil nil
491 (append browse-url-netscape-arguments 497 (append browse-url-netscape-arguments
492 (if new-window '("-noraise")) 498 (if new-window '("-noraise"))
493 (list "-remote" 499 (list "-remote"
@@ -500,7 +506,7 @@ used instead of browse-url-new-window-p."
500 (or (zerop res) 506 (or (zerop res)
501 (progn ; Netscape not running - start it 507 (progn ; Netscape not running - start it
502 (message "Starting Netscape...") 508 (message "Starting Netscape...")
503 (apply 'start-process "netscape" nil "netscape" 509 (apply 'start-process "netscape" nil browse-url-netscape-program
504 (append browse-url-netscape-arguments (list url)))))))) 510 (append browse-url-netscape-arguments (list url))))))))
505 511
506(defun browse-url-netscape-reload () 512(defun browse-url-netscape-reload ()
@@ -541,7 +547,7 @@ Default to the URL around or before point."
541 ) 547 )
542 ;; Mosaic not running - start it 548 ;; Mosaic not running - start it
543 (message "Starting Mosaic...") 549 (message "Starting Mosaic...")
544 (apply 'start-process "xmosaic" nil "xmosaic" 550 (apply 'start-process "xmosaic" nil browse-url-mosaic-program
545 (append browse-url-mosaic-arguments (list url))) 551 (append browse-url-mosaic-arguments (list url)))
546 (message "Starting Mosaic...done")))) 552 (message "Starting Mosaic...done"))))
547 553