X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
index c5533b7..a483ee4 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
@@ -950,6 +950,10 @@ public class Scanner implements IScanner, ITerminalSymbols {
               withoutUnicodePtr--;
             }
           }
+        } else if ((currentCharacter == '\r') || (currentCharacter == '\n')) {
+          if (recordLineSeparator) {
+            pushLineSeparator();
+          }
         }
         // consume next character
         unicodeAsBackSlash = false;
@@ -1046,6 +1050,10 @@ public class Scanner implements IScanner, ITerminalSymbols {
               withoutUnicodePtr--;
             }
           }
+        } else if ((currentCharacter == '\r') || (currentCharacter == '\n')) {
+          if (recordLineSeparator) {
+            pushLineSeparator();
+          }
         }
         // consume next character
         unicodeAsBackSlash = false;
@@ -1894,8 +1902,9 @@ public class Scanner implements IScanner, ITerminalSymbols {
           if (getNextChar('?')) {
             currentCharacter = source[currentPosition++];
             if ((currentCharacter != 'P') && (currentCharacter != 'p')) {
-              currentPosition--;
-              // (currentCharacter == ' ') || Character.isWhitespace(currentCharacter)) {
+              if (currentCharacter != '=') { // <?=
+                currentPosition--;
+              }
               // <?
               if (ignorePHPOneLiner) {
                 if (lookAheadLinePHPTag() == TokenNameINLINE_HTML) {