From 960b07daab34abc72d47c1150e222a395d60a728 Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Sun, 3 Apr 2016 15:45:19 -0700
Subject: [PATCH] Fix grouping of disconnect and delete.

---
 core/block_svg.js | 2 ++
 core/blockly.js   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/core/block_svg.js b/core/block_svg.js
index 6db02bc8c..0faa7c2cb 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -726,7 +726,9 @@ Blockly.BlockSvg.prototype.showContextMenu_ = function(e) {
           Blockly.Msg.DELETE_X_BLOCKS.replace('%1', String(descendantCount)),
       enabled: true,
       callback: function() {
+        Blockly.Events.setGroup(true);
         block.dispose(true, true);
+        Blockly.Events.setGroup(false);
       }
     };
     menuOptions.push(deleteOption);
diff --git a/core/blockly.js b/core/blockly.js
index 608909d90..85d311e6d 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -268,6 +268,7 @@ Blockly.onKeyDown_ = function(e) {
   }
   if (deleteBlock) {
     // Common code for delete and cut.
+    Blockly.Events.setGroup(true);
     Blockly.hideChaff();
     var heal = Blockly.dragMode_ != Blockly.DRAG_FREE;
     Blockly.selected.dispose(heal, true);
@@ -275,6 +276,7 @@ Blockly.onKeyDown_ = function(e) {
       Blockly.highlightedConnection_.unhighlight();
       Blockly.highlightedConnection_ = null;
     }
+    Blockly.Events.setGroup(false);
   }
 };