Adjusting whitespace and bracings after the previous changes.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5286 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

ChangeLog

@@ -8,6 +8,8 @@
 	the end-of-file to a less frequently travelled path.
 	* src/text.c (do_deletion): If a Backspace happens at the end-of-file,
 	don't remove and then re-add the magic line; just add an undo item.
+	* src/help.c (help_init), src/text.c (do_undo): Adjust whitespace and
+	bracing after the previous changes.
 
 GNU nano 2.4.2 - 2015.07.05
 2015-06-28  Benno Schulenberg  <bensberg@justemail.net>

src/help.c

@@ -448,22 +448,20 @@ void help_init(void)
 	int maximum = 0, counter = 0;
 
 	/* First see how many toggles there are. */
-	for (s = sclist; s != NULL; s = s->next) {
+	for (s = sclist; s != NULL; s = s->next)
 	   maximum = (s->toggle && s->ordinal > maximum) ? s->ordinal : maximum;
-	}
 
 	/* Now show them in the original order. */
 	while (counter < maximum) {
 	    counter++;
-	    for (s = sclist; s != NULL; s = s->next) {
+	    for (s = sclist; s != NULL; s = s->next)
 		if (s->toggle && s->ordinal == counter) {
-		ptr += sprintf(ptr, "%s\t\t%s %s\n", (s->menu == MMAIN ? s->keystr : ""),
+		    ptr += sprintf(ptr, "%s\t\t%s %s\n", (s->menu == MMAIN ? s->keystr : ""),
 				 _(flagtostr(s->toggle)), _("enable/disable"));
-	    if (s->toggle == NO_COLOR_SYNTAX || s->toggle == TABS_TO_SPACES)
-		ptr += sprintf(ptr, "\n");
+		    if (s->toggle == NO_COLOR_SYNTAX || s->toggle == TABS_TO_SPACES)
+			ptr += sprintf(ptr, "\n");
 		    break;
-	}
-	    }
+		}
 	}
     }
 

src/text.c

@@ -502,17 +502,15 @@ void do_undo(void)
 	    goto_line_posx(openfile->filebot->lineno, 0);
 	    break;
 	}
-	{/*FIXME: unindent*/
-	    t = make_new_node(f);
-	    t->data = mallocstrcpy(NULL, u->strdata);
-	    data = mallocstrncpy(NULL, f->data, u->mark_begin_x + 1);
-	    data[u->mark_begin_x] = '\0';
-	    free(f->data);
-	    f->data = data;
-	    splice_node(f, t, f->next);
-	    if (f == openfile->filebot)
-		openfile->filebot = t;
-	}
+	t = make_new_node(f);
+	t->data = mallocstrcpy(NULL, u->strdata);
+	data = mallocstrncpy(NULL, f->data, u->mark_begin_x + 1);
+	data[u->mark_begin_x] = '\0';
+	free(f->data);
+	f->data = data;
+	splice_node(f, t, f->next);
+	if (f == openfile->filebot)
+	    openfile->filebot = t;
 	goto_line_posx(u->lineno, u->begin);
 	break;
     case CUT_EOF: