1 files changed, 14 insertions, 13 deletions

diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c
index 3d39d0e..929510f 100644
--- a/usr.bin/units/units.c
+++ b/usr.bin/units/units.c
@@ -802,17 +802,6 @@ main(int argc, char **argv)
 	if (!readfile)
 		readunits(NULL);
 
-	inhistory = history_init();
-	el = el_init(argv[0], stdin, stdout, stderr);
-	el_set(el, EL_PROMPT, &prompt);
-	el_set(el, EL_EDITOR, "emacs");
-	el_set(el, EL_SIGNAL, 1);
-	el_set(el, EL_HIST, history, inhistory);
-	el_source(el, NULL);
-	history(inhistory, &ev, H_SETSIZE, 800);
-	if (inhistory == 0)
-		err(1, "Could not initialize history");
-
 	if (cap_enter() < 0 && errno != ENOSYS)
 		err(1, "unable to enter capability mode");
 
@@ -828,6 +817,17 @@ main(int argc, char **argv)
 		showanswer(&have, &want);
 	}
 	else {
+		inhistory = history_init();
+		el = el_init(argv[0], stdin, stdout, stderr);
+		el_set(el, EL_PROMPT, &prompt);
+		el_set(el, EL_EDITOR, "emacs");
+		el_set(el, EL_SIGNAL, 1);
+		el_set(el, EL_HIST, history, inhistory);
+		el_source(el, NULL);
+		history(inhistory, &ev, H_SETSIZE, 800);
+		if (inhistory == 0)
+			err(1, "Could not initialize history");
+
 		if (!quiet)
 			printf("%d units, %d prefixes\n", unitcount,
 			    prefixcount);
@@ -858,9 +858,10 @@ main(int argc, char **argv)
 			    completereduce(&want));
 			showanswer(&have, &want);
 		}
+
+		history_end(inhistory);
+		el_end(el);
 	}
 
-	history_end(inhistory);
-	el_end(el);
 	return (0);
 }