diff options
| author | Chong Yidong | 2009-11-20 21:49:46 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-11-20 21:49:46 +0000 |
| commit | e572025ff11352705a5145cf77cdf6227f36d4b4 (patch) | |
| tree | a17a1c3b131c2b6c8ec4b88a376a8f41dd14df4b | |
| parent | 5c3ef352f176e70d350dd65dca4f818971e86672 (diff) | |
| download | emacs-e572025ff11352705a5145cf77cdf6227f36d4b4.tar.gz emacs-e572025ff11352705a5145cf77cdf6227f36d4b4.zip | |
* net/browse-url.el (browse-url-default-windows-browser): Use
cygstart for cygwin.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/browse-url.el | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dab502c6bb8..ba2f222cf8f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-11-20 Ken Brown <kbrown@cornell.edu> (tiny change) | ||
| 2 | |||
| 3 | * net/browse-url.el (browse-url-default-windows-browser): Use | ||
| 4 | cygstart for cygwin. | ||
| 5 | |||
| 1 | 2009-11-20 Karl Fogel <karl.fogel@red-bean.com> | 6 | 2009-11-20 Karl Fogel <karl.fogel@red-bean.com> |
| 2 | 7 | ||
| 3 | * bookmark.el Formatting and doc fixes only: | 8 | * bookmark.el Formatting and doc fixes only: |
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 20311f6d4ce..ddfaa91d953 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el | |||
| @@ -830,11 +830,13 @@ to use." | |||
| 830 | 830 | ||
| 831 | (defun browse-url-default-windows-browser (url &optional new-window) | 831 | (defun browse-url-default-windows-browser (url &optional new-window) |
| 832 | (interactive (browse-url-interactive-arg "URL: ")) | 832 | (interactive (browse-url-interactive-arg "URL: ")) |
| 833 | (if (eq system-type 'ms-dos) | 833 | (cond ((eq system-type 'ms-dos) |
| 834 | (if dos-windows-version | 834 | (if dos-windows-version |
| 835 | (shell-command (concat "start " (shell-quote-argument url))) | 835 | (shell-command (concat "start " (shell-quote-argument url))) |
| 836 | (error "Browsing URLs is not supported on this system")) | 836 | (error "Browsing URLs is not supported on this system"))) |
| 837 | (w32-shell-execute "open" url))) | 837 | ((eq system-type 'cygwin) |
| 838 | (shell-command (concat "cygstart " (shell-quote-argument url)))) | ||
| 839 | (t (w32-shell-execute "open" url)))) | ||
| 838 | 840 | ||
| 839 | (defun browse-url-default-macosx-browser (url &optional new-window) | 841 | (defun browse-url-default-macosx-browser (url &optional new-window) |
| 840 | (interactive (browse-url-interactive-arg "URL: ")) | 842 | (interactive (browse-url-interactive-arg "URL: ")) |