[Emacs-diffs] trunk r113156: * net/shr.el (shr-browse-url): Use an external browser if given a prefix.

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 113156
revision-id: address@hidden
parent: address@hidden
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2013-06-24 16:03:26 +0200
message:
  * net/shr.el (shr-browse-url): Use an external browser if given a prefix.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/shr.el                shr.el-20101002102929-yfzewk55rsg0mn93-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-24 13:57:35 +0000
+++ b/lisp/ChangeLog    2013-06-24 14:03:26 +0000
@@ -1,5 +1,8 @@
 2013-06-24  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * net/shr.el (shr-browse-url): Use an external browser if given a
+       prefix.
+
        * net/eww.el (eww-external-browser): Moved to shr.
 
 2013-06-24  Ivan Kanis  <address@hidden>

=== modified file 'lisp/net/shr.el'
--- a/lisp/net/shr.el   2013-06-24 13:57:35 +0000
+++ b/lisp/net/shr.el   2013-06-24 14:03:26 +0000
@@ -645,9 +645,10 @@
            (forward-line 1)
          (goto-char end))))))
 
-(defun shr-browse-url ()
-  "Browse the URL under point."
-  (interactive)
+(defun shr-browse-url (&optional external)
+  "Browse the URL under point.
+If EXTERNAL, browse the URL using `shr-external-browser'."
+  (interactive "p")
   (let ((url (get-text-property (point) 'shr-url)))
     (cond
      ((not url)
@@ -655,7 +656,9 @@
      ((string-match "^mailto:"; url)
       (browse-url-mail url))
      (t
-      (browse-url url)))))
+      (if external
+         (funcall shr-external-browser url)
+       (browse-url url))))))
 
 (defun shr-save-contents (directory)
   "Save the contents from URL in a file."