figleaf.el: when converting to the elisp-readable format, use our in-tree version of figleaf rather than one found on the system. Also change the keybinding to toggle annotations to C-cC-a, which is easier to type

Makefile

@@ -45,7 +45,7 @@ figleaf-output:
 # coverage-html/index.html
 
 .figleaf.el: .figleaf
-	python misc/figleaf2el.py .figleaf `python ./builddir.py`
+	$(PP) python misc/figleaf2el.py .figleaf `python ./builddir.py`
 
 pyflakes:
 	pyflakes src/allmydata

misc/figleaf.el

@@ -126,7 +126,7 @@
   nil
   " FA"
   '(
-    ("\C-ca" . figleaf-toggle-annotations)
+    ("\C-c\C-a" . figleaf-toggle-annotations)
     )
 
   () ; forms run on mode entry/exit

misc/figleaf2el.py

@@ -55,7 +55,9 @@ def write_el(r2, source):
     out.write(" results)\n")
     out.close()
 
-import figleaf
+#import figleaf
+from allmydata.util import figleaf
+
 def examine_source(filename):
     f = open(filename, "r")
     lines = figleaf.get_lines(f)