From e5bc1eef59bc5dc2de5492d0293d2e9eca3ba596 Mon Sep 17 00:00:00 2001
From: Brian Granger <ellisonbg@gmail.com>
Date: Wed, 1 Feb 2012 09:57:23 -0800
Subject: [PATCH] Fixing Shift-Enter bug in text cells.

Hitting Shift-Enter on an already rendered text cell should simply
move past it. It was causing the cell to enter edit mode. This
is not fixed.
---
 IPython/frontend/html/notebook/static/js/textcell.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/frontend/html/notebook/static/js/textcell.js b/IPython/frontend/html/notebook/static/js/textcell.js
index 1c98deada..f48f452fa 100644
--- a/IPython/frontend/html/notebook/static/js/textcell.js
+++ b/IPython/frontend/html/notebook/static/js/textcell.js
@@ -49,7 +49,7 @@ var IPython = (function (IPython) {
         IPython.Cell.prototype.bind_events.apply(this);
         var that = this;
         this.element.keydown(function (event) {
-            if (event.which === 13) {
+            if (event.which === 13 && !event.shiftKey) {
                 if (that.rendered) {
                     that.edit();
                     return false;