merge upstream

lisp/ChangeLog

@@ -1,3 +1,7 @@
+2011-08-01  Deniz Dogan  <deniz@dogan.se>
+
+	* net/rcirc.el (rcirc-handler-333): Clarify docstring.
+
 2011-07-30  Michael Albinus  <michael.albinus@gmx.de>
 
 	Sync with Tramp 2.2.2.

lisp/net/rcirc.el

@@ -2695,7 +2695,8 @@ the only argument."
       (setq rcirc-topic (caddr args)))))
 
 (defun rcirc-handler-333 (process sender args text)
-  "Not in rfc1459.txt"
+  "333 says who set the topic and when.
+Not in rfc1459.txt"
   (let ((buffer (or (rcirc-get-buffer process (cadr args))
 		    (rcirc-get-temp-buffer-create process (cadr args)))))
     (with-current-buffer buffer

lisp/xwidget.el

@@ -19,8 +19,13 @@ see xwidget.c for types suitable for TYPE.
 
 
 (defun xwidget-at (pos)
-  (let* ((xw (car (cdr (cdr  (get-text-property pos 'display))))))
-    (if ( xwidgetp  car) xw nil))
+  ;;this function is a bit tedious because the C layer isnt well protected yet and
+  ;;xwidgetp aparently doesnt work yet
+  (let* ((disp (get-text-property pos 'display))
+         (xw (car (cdr (cdr  disp)))))
+    ;;(if ( xwidgetp  xw) xw nil)
+    (if (equal 'xwidget (car disp)) xw)
+    ))
 
 
 
@@ -43,7 +48,7 @@ see xwidget.c for types suitable for TYPE.
               ;;   (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" )  )
-                ))))))
+              )))))