diff --git a/src/cpp.c b/src/cpp.c
index 11425bfcd95c51604f285be7dfeabb59df16e46e..bb288e2a66f007b0cccda03f4737746208a4c1e2 100644
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -5,7 +5,7 @@
 \*/
 
 /*
- * $Id: cpp.c,v 1.61 2000/03/09 16:46:03 jhs Exp $
+ * $Id: cpp.c,v 1.62 2000/03/30 09:54:18 hubbe Exp $
  */
 #include "global.h"
 #include "language.h"
@@ -416,11 +416,15 @@ while(1)					\
     if(data[pos+1]=='\n')			\
     {						\
       pos++;					\
+      this->current_line++;			\
+      PUTNL();                                  \
       continue;					\
     }						\
     if(data[pos+1]=='\r' && data[pos+2]=='\n')	\
     {						\
       pos+=2;					\
+      this->current_line++;			\
+      PUTNL();                                  \
       continue;					\
     }						\
     READCHAR(tmp);				\
diff --git a/src/testsuite.in b/src/testsuite.in
index bdeff0af5d654e100722c3e0cf616f4115046b97..82df86fadb2742818022349ffb7fcbac1cf15d83 100644
--- a/src/testsuite.in
+++ b/src/testsuite.in
@@ -1,4 +1,4 @@
-test_true([["$Id: testsuite.in,v 1.289 2000/03/30 08:43:07 hubbe Exp $"]]);
+test_true([["$Id: testsuite.in,v 1.290 2000/03/30 09:54:18 hubbe Exp $"]]);
 
 cond([[all_constants()->_verify_internals]],
 [[
@@ -24,6 +24,8 @@ test_eq(-2147483648*-1, -2147483648/-1);
 test_true([[1.0e-40]]);
 test_eq([[#"foo
 bar"]],[["foo\nbar"]]);
+test_eq([[#"foo\
+bar"]],[["foobar"]]);
 test_true([[stringp(#string "Makefile")]]);
 test_any([[class Bar { array(int) foo = ({}); }; class Foo { inherit Bar; array(int) foo = ({1}); }; return sizeof(Foo()->foo);]],1);