diff --git a/IPython/html/static/notebook/js/codemirror-ipython.js b/IPython/html/static/notebook/js/codemirror-ipython.js
index 096ba17..1fb01ee 100644
--- a/IPython/html/static/notebook/js/codemirror-ipython.js
+++ b/IPython/html/static/notebook/js/codemirror-ipython.js
@@ -7,10 +7,15 @@ CodeMirror.requireMode('python',function(){
"use strict";
CodeMirror.defineMode("ipython", function(conf, parserConf) {
-
- parserConf.singleOperators = new RegExp("^[\\+\\-\\*/%&|\\^~<>!\\?]");
- parserConf.name = 'python'
- return CodeMirror.getMode(conf, parserConf);
+ var pythonConf = {};
+ for (var prop in parserConf) {
+ if (parserConf.hasOwnProperty(prop)) {
+ pythonConf[prop] = parserConf[prop];
+ }
+ }
+ pythonConf.name = 'python';
+ pythonConf.singleOperators = new RegExp("^[\\+\\-\\*/%&|\\^~<>!\\?]");
+ return CodeMirror.getMode(conf, pythonConf);
}, 'python');
CodeMirror.defineMIME("text/x-ipython", "ipython");