evil conflicts in c-mode

[Frank Fischer]

On Wed, Dec 07, 2011 at 02:42:07AM +0000, Jim Green wrote:
> I got the following error(I think expected) when make clean emacs

Well, no. No such error should occur. 

> , but
> enter works
> perfectly as tested above for a test c++ file. I found that in my
> cc-mode.rc.el I copied from somewhere else ret is redefined...
> 
> sorry about wasting your time and Thanks for such a great debugging trick!
> 
> Jim.
> 
> my emacs version is GNU Emacs 24.0.92.1
> 
> 
> Selector: t
> Passed: 127
> Failed: 2 (2 unexpected)
> Total:  129/129
> 
> Started at:   2011-12-06 21:35:41-0500
> Finished.
> Finished at:  2011-12-06 21:35:43-0500
> 
> ........................................F.....................................................................F..................
> 
> F evil-test-extract-count
>     Test `evil-extract-count'
>     Info: Exact with count
>     (error "No command bound to \346")

I have an idea for this bug. Could you please test the patch appended
to this mail and check if this error still occurs?

> 
> F evil-test-rot13-repeat
>     Test repeating of `evil-rot13'
>     (ert-test-failed
>      ((should
>        (string=
> 	(buffer-substring
> 	 (max ... ...)
> 	 (point))
> 	before))
>       :form
>       (string= " buffer" ";; Guvf")
>       :value nil))

I have no real idea what's happening here (it works on my box). If I
look at the test code I suppose that the cursor after executing 

g ? M-Right

is placed at the wrong position (the test assumes that point does not
move when executing this command), but I have to check if your Emacs
version behaves differently.

Frank
-------------- next part --------------
diff -r ebd81372116c evil-tests.el
--- a/evil-tests.el	Wed Dec 07 10:10:22 2011 +0100
+++ b/evil-tests.el	Wed Dec 07 10:34:07 2011 +0100
@@ -4234,8 +4234,8 @@
     (ert-info ("Exact with count")
       (should (equal (evil-extract-count "420x")
                      (list 420 'evil-delete-char "x" nil)))
-      (should (equal (evil-extract-count "420\M-f")
-                     (list 420 'forward-word "\M-f" nil)))
+      (should (equal (evil-extract-count (vconcat "420" (kbd "M-f")))
+                     (list 420 'forward-word (vconcat (kbd "M-f")) nil)))
       (should (equal (evil-extract-count "2301g0")
                      (list 2301 'evil-beginning-of-visual-line "g0" nil))))