--- c_source.h_skel.orig	2007-07-28 12:29:19.000000000 +0200
+++ c_source.h_skel	2007-09-29 10:12:11.000000000 +0200
@@ -702,8 +702,12 @@
             }
         }
       else
-        { /* read up the remaining part up to a delimiter */
-          next_token = strcspn (farg, " \t\r\n#\'\"");
+        { /* read up the remaining part  up to end of line 
+	   * or comment sign (#) or a double qoute (") which must be escaped */
+          char *ch = (str_index + (next_token = strcspn (farg, "\r\n\"#")));
+          /* remove trailing whitespaces */
+          for ( --ch; (*ch >= 0x09 && *ch <= 0x0D) || *ch == ' '; --ch )
+            --next_token;
           str_index += next_token;
         }