From da3558fddb385de8cd7d0ef4556b7073139a824e Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 4 Mar 2007 16:36:36 +0000
Subject: [PATCH] * parse.y (parser_yylex), win32/win32.c (rb_w32_utime): fixed
   indentation broken at YARV merger.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog     |  5 +++++
 parse.y       |  4 ++--
 version.h     |  6 +++---
 win32/win32.c | 12 ++++++------
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 55ceaf0ba4..433b30312a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar  5 01:36:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex), win32/win32.c (rb_w32_utime): fixed
+	  indentation broken at YARV merger.
+
 Sun Mar  4 23:41:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_stat_uid, rb_stat_gid, eaccess): use rb_uid_t and
diff --git a/parse.y b/parse.y
index 1fc7b4d8b9..d883b7c725 100644
--- a/parse.y
+++ b/parse.y
@@ -6085,8 +6085,8 @@ parser_yylex(struct parser_params *parser)
 	}
 	if (c == '>') {
 	    lex_state = EXPR_ARG;
-		return tLAMBDA;
-	    }
+	    return tLAMBDA;
+	}
 	if (IS_BEG() ||
 	    (IS_ARG() && space_seen && !ISSPACE(c))) {
 	    if (IS_ARG()) arg_ambiguous();
diff --git a/version.h b/version.h
index fddcd8d867..44e10e8d66 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-03-04"
+#define RUBY_RELEASE_DATE "2007-03-05"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070304
+#define RUBY_RELEASE_CODE 20070305
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 5
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
diff --git a/win32/win32.c b/win32/win32.c
index ada33421c0..496268705c 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -4049,12 +4049,12 @@ rb_w32_utime(const char *path, const struct utimbuf *times)
     }
 
     if (times) {
-    if (unixtime_to_filetime(times->actime, &atime)) {
-	return -1;
-    }
-    if (unixtime_to_filetime(times->modtime, &mtime)) {
-	return -1;
-    }
+	if (unixtime_to_filetime(times->actime, &atime)) {
+	    return -1;
+	}
+	if (unixtime_to_filetime(times->modtime, &mtime)) {
+	    return -1;
+	}
     }
     else {
 	GetSystemTimeAsFileTime(&atime);