2 files changed, 30 insertions, 22 deletions

diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 0f48f2d95b7..8a68fd47a74 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -19,30 +19,31 @@ see xwidget.c for types suitable for TYPE.
 
 
 (defun xwidget-at (pos)
-  (car (cdr (cdr  (get-text-property pos 'display)))))
+  (let* ((xw (car (cdr (cdr  (get-text-property pos 'display))))))
+    (if ( xwidgetp  car) xw nil))
 
 
 
-         
-(defun xwidget-socket-handler ()
-  "creates plug for socket. TODO"
-  (interactive)
-  (message "socket handler xwidget %S" last-input-event)
-  (let*
-      ((xwidget-event-type (nth 2 last-input-event))
-       (xwidget-id (nth 1 last-input-event)))
-    (cond ( (eq xwidget-event-type 'xembed-ready)
-            (let*
-                ((xembed-id (nth 3 last-input-event)))
-              (message "xembed ready  event: %S xw-id:%s" xembed-id xwidget-id)
-              ;;TODO fetch process data from the xwidget. create it, store process info
-              ;;will start emacs/uzbl in a xembed socket when its ready
-              ;; (cond
-              ;;  ((eq 3 xwidget-id)
-              ;;   (start-process "xembed" "*xembed*" (format "%ssrc/emacs" default-directory) "-q" "--parent-id" (number-to-string xembed-id) ) )
-              ;;  ((eq 5 xwidget-id)
-              ;;   (start-process "xembed2" "*xembed2*" "uzbl-core"  "-s" (number-to-string xembed-id)  "http://www.fsf.org" )  )
-              )))))
+  
+  (defun xwidget-socket-handler ()
+    "creates plug for socket. TODO"
+    (interactive)
+    (message "socket handler xwidget %S" last-input-event)
+    (let*
+        ((xwidget-event-type (nth 2 last-input-event))
+         (xwidget-id (nth 1 last-input-event)))
+      (cond ( (eq xwidget-event-type 'xembed-ready)
+              (let*
+                  ((xembed-id (nth 3 last-input-event)))
+                (message "xembed ready  event: %S xw-id:%s" xembed-id xwidget-id)
+                ;;TODO fetch process data from the xwidget. create it, store process info
+                ;;will start emacs/uzbl in a xembed socket when its ready
+                ;; (cond
+                ;;  ((eq 3 xwidget-id)
+                ;;   (start-process "xembed" "*xembed*" (format "%ssrc/emacs" default-directory) "-q" "--parent-id" (number-to-string xembed-id) ) )
+                ;;  ((eq 5 xwidget-id)
+                ;;   (start-process "xembed2" "*xembed2*" "uzbl-core"  "-s" (number-to-string xembed-id)  "http://www.fsf.org" )  )
+                ))))))
 
 
 
diff --git a/src/xwidget.c b/src/xwidget.c
index c2dc1ac8cf8..08b16bbbc35 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -757,6 +757,13 @@ DEFUN ("xwidget-size-request", Fxwidget_size_request, Sxwidget_size_request, 1,
 
 }
 
+DEFUN ("xwidgetp", Fxwidgetp, Sxwidgetp, 1, 1, 0,
+       doc: /* Return t if OBJECT is a xwidget.  */)
+  (Lisp_Object object)
+{
+  return XWIDGETP (object) ? Qt : Qnil;
+}
+
 DEFUN("xwidget-info", Fxwidget_info , Sxwidget_info, 1,1,0, doc: /* get xwidget props */)
   (Lisp_Object xwidget)
 {
@@ -865,7 +872,7 @@ syms_of_xwidget (void)
   int i;
 
   defsubr (&Smake_xwidget);
-
+  defsubr (&Sxwidgetp);
   defsubr (&Sxwidget_info);
   defsubr (&Sxwidget_view_info);
   defsubr (&Sxwidget_resize);