figleaf.el: when converting to the elisp-readable format, use our in-tree version...

diff --git a/Makefile b/Makefile
index 1c9e4223e96cbad9ab39141a5f87cf2d69680811..5f41e8ce36733bdd0761b1eb3f906ece8a8c9937 100644 (file)
--- a/Makefile
+++ b/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

diff --git a/misc/figleaf.el b/misc/figleaf.el
index d541a2a8c6546b8a629bd35da5e3d84aaf67c79e..6a4323b84885b680bb33f5f76671f1a1b299f296 100644 (file)
--- a/misc/figleaf.el
+++ b/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

diff --git a/misc/figleaf2el.py b/misc/figleaf2el.py
index bc15d3352ee9f0d28dfc570ce4c1c2ecc3f269e0..c32f3782e3fb59648f47e99618453cf68ee15bbb 100644 (file)
--- a/misc/figleaf2el.py
+++ b/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)