Merge branch 'obsd-master'

2025-11-06 03:26:05 +00:00 · 2017-01-16 15:36:02 +00:00
parent f20e3ee62c ef15b4195f
commit 7e110b9d99
5 changed files with 92 additions and 92 deletions
--- a/format.c
+++ b/format.c
@@ -642,7 +642,7 @@ format_find(struct format_tree *ft, const char *key, int modifiers)
 	struct format_entry	*fe, fe_find;
 	struct environ_entry	*envent;
 	static char		 s[64];
-	struct option		*o;
+	struct options_entry	*o;
 	const char		*found;
 	int			 idx;
 	char			*copy, *saved;