From aefe54574f86a5d30bf75c73889feac78e1b1d56 Mon Sep 17 00:00:00 2001 From: Brian Warner <warner@allmydata.com> Date: Mon, 8 Jan 2007 21:29:03 -0700 Subject: [PATCH] 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 | 2 +- misc/figleaf.el | 2 +- misc/figleaf2el.py | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) 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) -- 2.45.2