Various small fixes from Dominique Pelle.
diff --git a/src/ops.c b/src/ops.c
index 3233750..aa1fca4 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -5444,7 +5444,7 @@
     int	    max_kbyte;
     long    len;
 
-    fprintf(fp, _("\n# Registers:\n"));
+    fputs(_("\n# Registers:\n"), fp);
 
     /* Get '<' value, use old '"' value if '<' is not found. */
     max_num_lines = get_viminfo_parameter('<');
@@ -5474,7 +5474,7 @@
 	num_lines = y_regs[i].y_size;
 	if (num_lines == 0
 		|| (num_lines == 1 && y_regs[i].y_type == MCHAR
-					&& STRLEN(y_regs[i].y_array[0]) == 0))
+					&& *y_regs[i].y_array[0] == NUL))
 	    continue;
 
 	if (max_kbyte > 0)