Merge git://ozlabs.org/~paulus/gitk

diff --git a/editor.c b/editor.c
index c985eee1f9d1c7307b7f533cb2d38de5a42ccb23..71547674ab4e885bd06560a547e78fddb0849158 100644 (file)
--- a/editor.c
+++ b/editor.c
@@ -78,6 +78,7 @@ static int launch_specified_editor(const char *editor, const char *path,
                p.argv = args;
                p.env = env;
                p.use_shell = 1;
+               p.trace2_child_class = "editor";
                if (start_command(&p) < 0)
                        return error("unable to start editor '%s'", editor);