diff --git a/mozilla/js/rhino/org/mozilla/javascript/LineBuffer.java b/mozilla/js/rhino/org/mozilla/javascript/LineBuffer.java
index 1da88248370..668b4a2b4c9 100644
--- a/mozilla/js/rhino/org/mozilla/javascript/LineBuffer.java
+++ b/mozilla/js/rhino/org/mozilla/javascript/LineBuffer.java
@@ -92,7 +92,13 @@ final class LineBuffer {
                         && (buffer[offset] != '\u2028')
                         && (buffer[offset] != '\u2029'))
                     { 
-			            return (int) buffer[offset++];
+                        if (Character.getType(buffer[offset])
+                                                    == Character.FORMAT) {
+				            hadCFSinceStringStart = true;
+				            offset++;
+                            continue;
+                        }
+                        return (int) buffer[offset++];
 			        }
 			    offset++;
 			    prevStart = lineStart;
@@ -101,7 +107,7 @@ final class LineBuffer {
 			    return '\n';
 			}
 			if ((buffer[offset] >= 128) 
-				&& Character.getType(buffer[offset]) == Character.FORMAT) {
+				  && (Character.getType(buffer[offset]) == Character.FORMAT)) {
 				hadCFSinceStringStart = true;
 				offset++;
 			}
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/LineBuffer.java b/mozilla/js/rhino/src/org/mozilla/javascript/LineBuffer.java
index 1da88248370..668b4a2b4c9 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/LineBuffer.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/LineBuffer.java
@@ -92,7 +92,13 @@ final class LineBuffer {
                         && (buffer[offset] != '\u2028')
                         && (buffer[offset] != '\u2029'))
                     { 
-			            return (int) buffer[offset++];
+                        if (Character.getType(buffer[offset])
+                                                    == Character.FORMAT) {
+				            hadCFSinceStringStart = true;
+				            offset++;
+                            continue;
+                        }
+                        return (int) buffer[offset++];
 			        }
 			    offset++;
 			    prevStart = lineStart;
@@ -101,7 +107,7 @@ final class LineBuffer {
 			    return '\n';
 			}
 			if ((buffer[offset] >= 128) 
-				&& Character.getType(buffer[offset]) == Character.FORMAT) {
+				  && (Character.getType(buffer[offset]) == Character.FORMAT)) {
 				hadCFSinceStringStart = true;
 				offset++;
 			}