From: Brian Warner <warner@allmydata.com>
Date: Tue, 9 Jan 2007 04:29:03 +0000 (-0700)
Subject: figleaf.el: when converting to the elisp-readable format, use our in-tree version... 
X-Git-Tag: tahoe_v0.1.0-0-UNSTABLE~384
X-Git-Url: https://git.rkrishnan.org/zeppelin?a=commitdiff_plain;h=aefe54574f86a5d30bf75c73889feac78e1b1d56;p=tahoe-lafs%2Ftahoe-lafs.git

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
---

diff --git a/Makefile b/Makefile
index 1c9e4223..5f41e8ce 100644
--- 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 d541a2a8..6a4323b8 100644
--- 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 bc15d335..c32f3782 100644
--- 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)