Fix: cleanup after #333 fix, use 'cl-flet'

[gnu-emacs-elpa] / yasnippet-tests.el

diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index 194c0fd8f6c070559f65f6d27648cba538c8d5e4..cdb781af1eefad013f9fdc3a15368819ac47b4b5 100644 (file)
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -222,7 +222,7 @@
                          \"ok\"
                          \"fail\")`"))
       (yas-expand-snippet snippet))
-      (should (string= (yas--buffer-contents) "ok"))))
+    (should (string= (yas--buffer-contents) "ok"))))
 
 (ert-deftest string-match-with-subregexp-in-mirror-transformations ()
   (with-temp-buffer
@@ -260,11 +260,11 @@ TODO: correct this bug!"
 (defmacro yas-with-overriden-buffer-list (&rest body)
   (let ((saved-sym (gensym)))
     `(let ((,saved-sym (symbol-function 'buffer-list)))
-       (flet ((buffer-list ()
-                           (remove-if #'(lambda (buf)
-                                          (with-current-buffer buf
-                                            (eq major-mode 'lisp-interaction-mode)))
-                                      (funcall ,saved-sym))))
+       (cl-flet ((buffer-list ()
+                              (remove-if #'(lambda (buf)
+                                             (with-current-buffer buf
+                                               (eq major-mode 'lisp-interaction-mode)))
+                                         (funcall ,saved-sym))))
          ,@body))))
 
 (defmacro yas-with-some-interesting-snippet-dirs (&rest body)
@@ -474,9 +474,9 @@ TODO: be meaner"
 (defun yas/ert ()
   (interactive)
   (with-temp-buffer
-    (flet ((message (&rest args)
-                    (declare (ignore args))
-                    nil))
+    (cl-flet ((message (&rest args)        ;
+                       (declare (ignore args))
+                       nil))
       (ert t (buffer-name (current-buffer)))
       (princ (buffer-string)))))