[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15121] trunk/blender/source/blender/ blenkernel/intern/text.c: svn merge -r15118:15119 https://svn.blender.org /svnroot/bf-blender/branches/soc-2008-quorn

[Campbell Barton]

Revision: 15121
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15121
Author:   campbellbarton
Date:     2008-06-04 18:38:55 +0200 (Wed, 04 Jun 2008)

Log Message:
-----------
svn  merge  -r15118:15119 https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-quorn

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/text.c

Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c	2008-06-04 16:19:15 UTC (rev 15120)
+++ trunk/blender/source/blender/blenkernel/intern/text.c	2008-06-04 16:38:55 UTC (rev 15121)
@@ -2075,13 +2075,13 @@
 	  return;
 	}
 	else if (text->curc==0) { /* Appending two lines */
-	    if (text->curl->prev) {
-	      text->curl= text->curl->prev;
-	      text->curc= text->curl->len;
-			
-	      txt_combine_lines(text, text->curl, text->curl->next);
-	      txt_pop_sel(text);
-	    }
+		if (!text->curl->prev) return;
+		
+		text->curl= text->curl->prev;
+		text->curc= text->curl->len;
+		
+		txt_combine_lines(text, text->curl, text->curl->next);
+		txt_pop_sel(text);
 	} 
 	else { /* Just backspacing a char */
 	  int i= text->curc-1;