X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Ftext_object.c;h=a34f74a64b57517195b4a3844b63c66d0fcd5b7e;hb=72c9a740c77f3e73e2d104add63890ee7df13b43;hp=3b0fb42440a7e8ad0c6bcf6958254e7608e70735;hpb=37071ccd8e03de74c91dad2aa59ec1717797ad4e;p=monky

diff --git a/src/text_object.c b/src/text_object.c
index 3b0fb42..a34f74a 100644
--- a/src/text_object.c
+++ b/src/text_object.c
@@ -9,7 +9,7 @@
  *
  * Please see COPYING for details
  *
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *	(see AUTHORS)
  * All rights reserved.
  *
@@ -55,7 +55,7 @@ int append_object(struct text_object *root, struct text_object *obj)
 
 	if (end) {
 		if (end->next)
-			CRIT_ERR(NULL, NULL, "huston, we have a lift-off");
+			CRIT_ERR(NULL, NULL, "houston, we have a lift-off");
 		end->next = obj;
 	} else {
 		root->next = obj;
@@ -107,7 +107,7 @@ static int push_ifblock(struct ifblock_stack_obj **ifblock_stack_top,
 		case IFBLOCK_ENDIF:
 			if (!(*ifblock_stack_top))
 				CRIT_ERR(NULL, NULL, "got an endif without matching if");
-			(*ifblock_stack_top)->obj->special_data = obj;
+			(*ifblock_stack_top)->obj->ifblock_next = obj;
 			/* if there's some else in between, remove and free it */
 			if ((*ifblock_stack_top)->type == IFBLOCK_ELSE) {
 				stackobj = *ifblock_stack_top;
@@ -122,7 +122,7 @@ static int push_ifblock(struct ifblock_stack_obj **ifblock_stack_top,
 		case IFBLOCK_ELSE:
 			if (!(*ifblock_stack_top))
 				CRIT_ERR(NULL, NULL, "got an else without matching if");
-			(*ifblock_stack_top)->obj->special_data = obj;
+			(*ifblock_stack_top)->obj->ifblock_next = obj;
 			/* fall through */
 		case IFBLOCK_IF:
 			stackobj = malloc(sizeof(struct ifblock_stack_obj));