Merge branch 'source-maps' of github.com:int3/emscripten into int3-source-maps

Conflicts:
	tools/js-optimizer.js

2 files changed, 4 insertions, 6 deletions

diff --git a/src/jsifier.js b/src/jsifier.js
index ac6c259b..d6cd188c 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -695,7 +695,9 @@ function JSify(data, functionsOnly, givenFunctions) {
               }
             }
             i++;
-            return JS + (Debugging.on ? Debugging.getComment(line.lineNum) : '');
+            // invoke instructions span two lines, and the debug info is located
+            // on the second line, hence the +1
+            return JS + (Debugging.on ? Debugging.getComment(line.lineNum + (line.intertype === 'invoke' ? 1 : 0)) : '');
           })
                                   .join('\n')
                                   .split('\n') // some lines include line breaks
diff --git a/src/shell.html b/src/shell.html
index f7eb9e1f..00765271 100644
--- a/src/shell.html
+++ b/src/shell.html
@@ -87,10 +87,6 @@
       };
       Module.setStatus('Downloading...');
     </script>      
-    <script type='text/javascript'>
-
-      {{{ SCRIPT_CODE }}}
-
-    </script>
+    <script type='text/javascript'>{{{ SCRIPT_CODE }}}</script>
   </body>
 </html>