Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kern…

…el/git/acme/linux-2.6 into perf/urgent
git-mirror · Aug 16, 2010 · f24645a · f24645a
2 parents d244b6b + e918462
commit f24645a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
@@ -146,6 +146,7 @@ static int annotate_browser__run(struct annotate_browser *self,
 		return -1;
 
 	newtFormAddHotKey(self->b.form, NEWT_KEY_LEFT);
+	newtFormAddHotKey(self->b.form, NEWT_KEY_RIGHT);
 
 	nd = self->curr_hot;
 	if (nd) {
@@ -178,7 +179,7 @@ static int annotate_browser__run(struct annotate_browser *self,
 	}
 out:
 	ui_browser__hide(&self->b);
-	return 0;
+	return es->u.key;
 }
 
 int hist_entry__tui_annotate(struct hist_entry *self)