diff -Naur xwidget.orig/lisp/xwidget.el xwidget.new/lisp/xwidget.el
--- xwidget.orig/lisp/xwidget.el	2012-09-28 04:49:18.000000000 +0200
+++ xwidget.new/lisp/xwidget.el	2012-10-03 10:01:38.000000000 +0200
@@ -1,3 +1,4 @@
+
 ;;; xwidget.el --- api functions for xwidgets
 ;;  see xwidget.c for more api functions
 
@@ -93,13 +94,13 @@
 (defmacro xwidget-image-mode-navigation-adaptor (fn)
   "Image code adaptor.  `image-mode' FN is called."
   `(lambda () (interactive)
-     (flet ((image-display-size (spec) (xwidget-image-display-size spec)))
+     (cl-flet ((image-display-size (spec) (xwidget-image-display-size spec)))
        (funcall ,fn ))))
 
 (defmacro xwidget-image-mode-navigation-adaptor-p (fn)
     "Image code adaptor.  `image-mode' FN is called with interactive arg."
   `(lambda (n) (interactive "p")
-     (flet ((image-display-size (spec) (xwidget-image-display-size spec)))
+     (cl-flet ((image-display-size (spec) (xwidget-image-display-size spec)))
        (funcall ,fn n))))