aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love1999-01-13 12:55:54 +0000
committerDave Love1999-01-13 12:55:54 +0000
commita0f036f80909104d88286f9607ab6b37d64cd005 (patch)
treeea4064e94429806dd4bd5729ebae63ab611015fe
parent43920c264421c72d6846d1da68727043a74240a1 (diff)
downloademacs-a0f036f80909104d88286f9607ab6b37d64cd005.tar.gz
emacs-a0f036f80909104d88286f9607ab6b37d64cd005.zip
(browse-url-netscape): Fix ineffective "-noraise".
-rw-r--r--lisp/browse-url.el28
1 files changed, 15 insertions, 13 deletions
diff --git a/lisp/browse-url.el b/lisp/browse-url.el
index f7525b5a852..cc63b39c7bd 100644
--- a/lisp/browse-url.el
+++ b/lisp/browse-url.el
@@ -1,6 +1,6 @@
1;;; browse-url.el --- Pass a URL to a WWW browser 1;;; browse-url.el --- Pass a URL to a WWW browser
2 2
3;; Copyright 1995, 1996, 1997, 1998 Free Software Foundation, Inc. 3;; Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
4 4
5;; Author: Denis Howe <dbh@doc.ic.ac.uk> 5;; Author: Denis Howe <dbh@doc.ic.ac.uk>
6;; Maintainer: Dave Love <fx@gnu.org> 6;; Maintainer: Dave Love <fx@gnu.org>
@@ -707,18 +707,20 @@ used instead of `browse-url-new-window-p'."
707 (format "%%%x" (string-to-char (match-string 0 url))) t t url))) 707 (format "%%%x" (string-to-char (match-string 0 url))) t t url)))
708 (let* ((process-environment (browse-url-process-environment)) 708 (let* ((process-environment (browse-url-process-environment))
709 (process (apply 'start-process 709 (process (apply 'start-process
710 (concat "netscape " url) nil 710 (concat "netscape " url) nil
711 browse-url-netscape-program 711 browse-url-netscape-program
712 (append browse-url-netscape-arguments 712 (append
713 (if (eq window-system 'w32) 713 browse-url-netscape-arguments
714 (list url) 714 (if (eq window-system 'w32)
715 (if new-window '("-noraise")) 715 (list url)
716 (list "-remote" 716 (append
717 (concat "openURL(" url 717 (if new-window '("-noraise"))
718 (if (browse-url-maybe-new-window 718 (list "-remote"
719 new-window) 719 (concat "openURL(" url
720 ",new-window") 720 (if (browse-url-maybe-new-window
721 ")"))))))) 721 new-window)
722 ",new-window")
723 ")"))))))))
722 (set-process-sentinel process 724 (set-process-sentinel process
723 (list 'lambda '(process change) 725 (list 'lambda '(process change)
724 (list 'browse-url-netscape-sentinel 'process url))))) 726 (list 'browse-url-netscape-sentinel 'process url)))))