From 24916baf70d7c4ff71125defdb7b8160b7b017ed Mon Sep 17 00:00:00 2001
From: David Mellis <d.mellis@arduino.cc>
Date: Sun, 11 Mar 2012 13:50:47 -0400
Subject: [PATCH] Don't insert newline in serial monitor keyboard shortcut
 (Lars J. Nielsen)

http://code.google.com/p/arduino/issues/detail?id=279
---
 app/src/processing/app/EditorListener.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/processing/app/EditorListener.java b/app/src/processing/app/EditorListener.java
index 58c3fc9a1..12806b4ce 100644
--- a/app/src/processing/app/EditorListener.java
+++ b/app/src/processing/app/EditorListener.java
@@ -122,6 +122,14 @@ public class EditorListener {
       }
     }
 
+    if ((event.getModifiers() & KeyEvent.CTRL_MASK) != 0) {
+      // Consume ctrl-m(carriage return) keypresses
+      if (code == KeyEvent.VK_M) {
+        event.consume();  // does nothing
+        return false;
+      }
+    }
+
     if ((event.getModifiers() & KeyEvent.META_MASK) != 0) {
       //event.consume();  // does nothing
       return false;