(browse-url-interactive-arg): Enable user to explicitly select the text to

be taken as URL.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1533d3aae184b3a8523a7a5940d654c625d06943..6035f696952765a12c50ae08d1808885d300c499 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-24  Yoichi NAKAYAMA  <yoichi@geiin.org>  (tiny change)
+
+       * net/browse-url.el (browse-url-interactive-arg): Enable user to
+       explicitly select the text to be taken as URL.
+
 2004-05-23  Juri Linkov  <juri@jurta.org>
 
        * info.el (Info-index-nodes): New var and fun.
@@ -69,7 +74,7 @@
        * progmodes/gud.el (gud-menu-map, gud-speedbar-menu-items)
        (gud-speedbar-buttons, gud-sentinel, gud-display-line)
        (gud-basic-call): Handle new value for gud-minor-mode (gdbmi) for
-       a new mode. The file (gdb-mi.el) for this mode will be included
+       a new mode.  The file (gdb-mi.el) for this mode will be included
        with the GDB distribution (6.2 onwards) and will use GDB/MI as its
        primary interface.
 

diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 8000e49c6d8d983eef77c99b8cad170f14399edf..e98b3d815ab3228bffff29ca40874839c02344d9 100644 (file)
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -577,13 +577,21 @@ down (this *won't* always work)."
 
 (defun browse-url-interactive-arg (prompt)
   "Read a URL from the minibuffer, prompting with PROMPT.
-Default to the URL at or before point.  If invoked with a mouse button,
-set point to the position clicked first.  Return a list for use in
-`interactive' containing the URL and `browse-url-new-window-flag' or its
+If `transient-mark-mode' is non-nil and the mark is active,
+defaults to the current region, else to the URL at or before
+point.  If invoked with a mouse button, set point to the
+position clicked first.  Return a list for use in `interactive'
+containing the URL and `browse-url-new-window-flag' or its
 negation if a prefix argument was given."
   (let ((event (elt (this-command-keys) 0)))
     (and (listp event) (mouse-set-point event)))
-  (list (read-string prompt (browse-url-url-at-point))
+  (list (read-string prompt (or (and transient-mark-mode mark-active
+                                    ;; rfc2396 Appendix E.
+                                    (replace-regexp-in-string
+                                     "[\t\r\f\n ]+" ""
+                                     (buffer-substring-no-properties
+                                      (region-beginning) (region-end))))
+                               (browse-url-url-at-point)))
        (not (eq (null browse-url-new-window-flag)
                 (null current-prefix-arg)))))