aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-07-03 12:41:58 +0000
committerEli Zaretskii2001-07-03 12:41:58 +0000
commit51a91c091083098a2f347564594ca169175bba0f (patch)
tree04f78340401dd775c87745af4f8146e6eda8fb42
parentf1c53471a7eda50ac95f3961f57baadcd514e6e0 (diff)
downloademacs-51a91c091083098a2f347564594ca169175bba0f.tar.gz
emacs-51a91c091083098a2f347564594ca169175bba0f.zip
(browse-url-default-windows-browser): Support
the MS-DOS port when it runs on Windows. (browse-url-browser-function) [ms-dos]: Default to browse-url-default-windows-browser.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/browse-url.el8
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e1259af3479..aa4ef387e14 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
12001-07-03 Eli Zaretskii <eliz@is.elta.co.il> 12001-07-03 Eli Zaretskii <eliz@is.elta.co.il>
2 2
3 * net/browse-url.el (browse-url-default-windows-browser): Support
4 the MS-DOS port when it runs on Windows.
5 (browse-url-browser-function) [ms-dos]: Default to
6 browse-url-default-windows-browser.
7
3 * help.el (locate-library): Enable code that looks for compressed 8 * help.el (locate-library): Enable code that looks for compressed
4 libraries if auto-compression-mode is on. 9 libraries if auto-compression-mode is on.
5 10
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 5419ed63686..3b516c26692 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -236,7 +236,7 @@
236 236
237;;;###autoload 237;;;###autoload
238(defcustom browse-url-browser-function 238(defcustom browse-url-browser-function
239 (if (eq system-type 'windows-nt) 239 (if (memq system-type '(windows-nt ms-dos))
240 'browse-url-default-windows-browser 240 'browse-url-default-windows-browser
241 'browse-url-netscape) 241 'browse-url-netscape)
242 "*Function to display the current buffer in a WWW browser. 242 "*Function to display the current buffer in a WWW browser.
@@ -670,7 +670,11 @@ to use."
670 670
671(defun browse-url-default-windows-browser (url &optional new-window) 671(defun browse-url-default-windows-browser (url &optional new-window)
672 (interactive (browse-url-interactive-arg "URL: ")) 672 (interactive (browse-url-interactive-arg "URL: "))
673 (w32-shell-execute "open" url)) 673 (if (eq system-type 'ms-dos)
674 (if dos-windows-version
675 (shell-command (concat "start " (shell-quote-argument url)))
676 (error "Browsing URLs is not supported on this system"))
677 (w32-shell-execute "open" url)))
674 678
675;; --- Netscape --- 679;; --- Netscape ---
676 680