From: Joakim Verona <joakim@verona.se>
Date: Tue, 26 Mar 2013 15:15:43 +0000 (+0100)
Subject: cl-flet replaces flet (Stefan Hussman)
X-Git-Tag: emacs-25.0.90~2940
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=62dd123f7c11ddbe156bc0e84dcb7ca1da5368bb;p=emacs.git

cl-flet replaces flet (Stefan Hussman)
---

diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 38b404586e6..8af8d47c00d 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -64,7 +64,7 @@ see xwidget.c for types suitable for TYPE."
 ;;; webkit support
 (require 'browse-url)
 (require 'image-mode);;for some image-mode alike functinoality
-(require 'cl);;for flet
+(require 'cl-macs);;for flet
 
 ;;;###autoload
 (defun xwidget-webkit-browse-url (url &optional new-session)
@@ -93,13 +93,13 @@ defaults to the string looking like a url around the cursor position."
 (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))))