diff options
| author | Glenn Morris | 2012-02-08 22:14:22 -0500 |
|---|---|---|
| committer | Glenn Morris | 2012-02-08 22:14:22 -0500 |
| commit | d95b247d1d8fbfae4c739f6a1f47069b7807964c (patch) | |
| tree | 2548eabde33e8364aef869673b59541b1fb9910e | |
| parent | 54cdb2530e755f4fe4cb08ad740c14aedfd85a1c (diff) | |
| download | emacs-d95b247d1d8fbfae4c739f6a1f47069b7807964c.tar.gz emacs-d95b247d1d8fbfae4c739f6a1f47069b7807964c.zip | |
Doc fixes for browse-url
* lisp/net/browse-url.el (browse-url-can-use-xdg-open, browse-url-xdg-open):
Doc fixes.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/net/browse-url.el | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0e9cf1ebd70..891b164a55a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2012-02-09 Glenn Morris <rgm@gnu.org> | 1 | 2012-02-09 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * net/browse-url.el (browse-url-can-use-xdg-open) | ||
| 4 | (browse-url-xdg-open): Doc fixes. | ||
| 5 | |||
| 3 | * electric.el (electric-indent-mode, electric-pair-mode) | 6 | * electric.el (electric-indent-mode, electric-pair-mode) |
| 4 | (electric-layout-rules, electric-layout-mode): Doc fixes. | 7 | (electric-layout-rules, electric-layout-mode): Doc fixes. |
| 5 | (electric-pair-pairs, electric-pair-skip-self): Add :version tags. | 8 | (electric-pair-pairs, electric-pair-skip-self): Add :version tags. |
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index f378277d5f0..99f3c53f025 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el | |||
| @@ -944,7 +944,9 @@ used instead of `browse-url-new-window-flag'." | |||
| 944 | url args)) | 944 | url args)) |
| 945 | 945 | ||
| 946 | (defun browse-url-can-use-xdg-open () | 946 | (defun browse-url-can-use-xdg-open () |
| 947 | "Check if xdg-open can be used, i.e. we are on Gnome, KDE, Xfce4 or LXDE." | 947 | "Return non-nil if the \"xdg-open\" program can be used. |
| 948 | xdg-open is a desktop utility that calls your preferred web browser. | ||
| 949 | This requires you to be running either Gnome, KDE, Xfce4 or LXDE." | ||
| 948 | (and (getenv "DISPLAY") | 950 | (and (getenv "DISPLAY") |
| 949 | (executable-find "xdg-open") | 951 | (executable-find "xdg-open") |
| 950 | ;; xdg-open may call gnome-open and that does not wait for its child | 952 | ;; xdg-open may call gnome-open and that does not wait for its child |
| @@ -974,7 +976,10 @@ used instead of `browse-url-new-window-flag'." | |||
| 974 | 976 | ||
| 975 | 977 | ||
| 976 | ;;;###autoload | 978 | ;;;###autoload |
| 977 | (defun browse-url-xdg-open (url &optional new-window) | 979 | (defun browse-url-xdg-open (url &optional ignored) |
| 980 | "Pass the specified URL to the \"xdg-open\" command. | ||
| 981 | xdg-open is a desktop utility that calls your preferred web browser. | ||
| 982 | The optional argument IGNORED is not used." | ||
| 978 | (interactive (browse-url-interactive-arg "URL: ")) | 983 | (interactive (browse-url-interactive-arg "URL: ")) |
| 979 | (call-process "xdg-open" nil 0 nil url)) | 984 | (call-process "xdg-open" nil 0 nil url)) |
| 980 | 985 | ||