diff --git a/src/viminfo.c b/src/viminfo.c
index 7247394..b772fc8 100644
--- a/src/viminfo.c
+++ b/src/viminfo.c
@@ -1319,7 +1319,7 @@
     fputs(_("\n# global variables:\n"), fp);
 
     todo = (int)gvht->ht_used;
-    for (hi = gvht->ht_array; todo > 0; ++hi)
+    FOR_ALL_HASHTAB_ITEMS(gvht, hi, todo)
     {
 	if (!HASHITEM_EMPTY(hi))
 	{