diff options
| author | isaacs <i@izs.me> | 2013-05-31 11:52:57 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2013-05-31 11:52:57 -0700 |
| commit | 2900f0778a850ada6463e07de9725f9022029e67 (patch) | |
| tree | 251e00ef0db9e614f416c15340d5941e9bff182b /lib/repl.js | |
| parent | 4b31a2d8dafdeac404f5fb0c52b910bc30f458ae (diff) | |
| parent | ce54f4ae50a5bd224e08bf058b118a7c68966cb4 (diff) | |
| download | nodejs-2900f0778a850ada6463e07de9725f9022029e67.tar.gz nodejs-2900f0778a850ada6463e07de9725f9022029e67.tar.bz2 nodejs-2900f0778a850ada6463e07de9725f9022029e67.zip | |
Merge remote-tracking branch 'ry/v0.10'
Conflicts:
ChangeLog
src/node_version.h
Diffstat (limited to 'lib/repl.js')
| -rw-r--r-- | lib/repl.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/repl.js b/lib/repl.js index 7e9d0527b..5980bef1c 100644 --- a/lib/repl.js +++ b/lib/repl.js @@ -940,6 +940,5 @@ function isSyntaxError(e) { // "strict mode" syntax errors !e.match(/^SyntaxError: .*strict mode.*/i) && // JSON.parse() error - !(e.match(/^SyntaxError: Unexpected (token .*|end of input)/) && - e.match(/\n {4}at Object.parse \(native\)\n/)); + !e.match(/\n {4}at Object.parse \(native\)\n/); } |