From fd233c04910239699de94b9e386ac2c657c05b6b Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@altern.org>
Date: Fri, 20 Jan 2012 16:32:03 +0100
Subject: [PATCH] org.el (org-return): Act normally when in code blocks.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* org.el (org-return): Act normally when in code blocks.

Thanks to Sébastien Vauban for spotting this.
---
 lisp/org.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/org.el b/lisp/org.el
index b204b0b47..ba8d1446f 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -18494,7 +18494,8 @@ Calls `org-table-next-row' or `newline', depending on context.
 See the individual commands for more information."
   (interactive)
   (cond
-   ((bobp) (if indent (newline-and-indent) (newline)))
+   ((or (bobp) (org-in-src-block-p))
+    (if indent (newline-and-indent) (newline)))
    ((org-at-table-p)
     (org-table-justify-field-maybe)
     (call-interactively 'org-table-next-row))
-- 
2.11.4.GIT