improvement to 'g'

3 files changed, 15 insertions, 4 deletions

diff --git a/README.xwidget b/README.xwidget
index f1b3e245dc5..5b0bfcd91f3 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -1476,3 +1476,11 @@ VirtualBox images to test with.
    CLOSED: [2011-11-01 Tue 11:19]
 http://www.youtube.com/watch?v=DZdUgjEx_dQ&html5=1
 html5 makes it work without stupid flash plugins!
+** TODO clicking on an webkit xwidgets
+doesn't make the window active. this leads to problems.
+** DONE "g" should default to current url
+   CLOSED: [2011-11-03 Thu 22:25]
+"g" runs xwidget-webkit-browse-url which gets its interactive argument
+from browse-url-interactive-arg. this might need a new optional argument.
+
+http://test
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 39a48bde645..87e772f1833 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -669,7 +669,7 @@ regarding its parameter treatment."
 ;; functions allows them to be stand-alone commands, making it easier
 ;; to switch between browsers.
 
-(defun browse-url-interactive-arg (prompt)
+(defun browse-url-interactive-arg (prompt &optional default-url)
   "Read a URL from the minibuffer, prompting with PROMPT.
 If `transient-mark-mode' is non-nil and the mark is active,
 it defaults to the current region, else to the URL at or before
@@ -686,7 +686,8 @@ for use in `interactive'."
                                       "[\t\r\f\n ]+" ""
                                       (buffer-substring-no-properties
                                        (region-beginning) (region-end))))
-                                (browse-url-url-at-point)))
+                                (browse-url-url-at-point)
+                                default-url))
         (not (eq (null browse-url-new-window-flag)
                  (null current-prefix-arg)))))
 
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index e89f074280d..0225889811d 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -72,7 +72,7 @@ NEW-SESSION specifies whether to create a new xwidget-webkit session.  URL
 defaults to the string looking like a url around the cursor position."
   (interactive (progn
                  (require 'browse-url)
-                 (browse-url-interactive-arg "xwidget-webkit URL: ")))
+                 (browse-url-interactive-arg "xwidget-webkit URL: " ( xwidget-webkit-current-url))))
   (when (stringp url)
     (setq url (url-tidy url))
     (if new-session
@@ -337,7 +337,9 @@ Argument H height."
 (defun xwidget-webkit-current-url ()
   "Get the webkit url. place it on kill ring."
   (interactive)
-  (message "url: %s" (kill-new   (xwidget-webkit-execute-script-rv (xwidget-webkit-current-session) "document.URL"))))
+  (let ((url (kill-new   (xwidget-webkit-execute-script-rv (xwidget-webkit-current-session) "document.URL"))))
+    (message "url: %s" url )
+    url))
 
 (defun xwidget-webkit-execute-script-rv (xw script &optional default)
   "same as xwidget-webkit-execute-script but also wraps an ugly hack to return a value"