Merge 3.2 #14929

diff --cc Misc/NEWS
index 3e4157ecfded0a3e72d94d3b5a1b2e7289b01ccd,2b457232f2e4825223188e607d5e02bf08cdfef3..bd296cac7256aadf285ff067ea1085b743e90f5b
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -49,9 -67,9 +49,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue14929: Stop Idle 3.x from closing on Unicode decode errors when grepping.
+   Patch by Roger Serwy.
+ 
 +- Issue #12515: email now registers a defect if it gets to EOF while parsing
 +  a MIME part without seeing the closing MIME boundary.
 +
  - Issue12510: Attempting to get invalid tooltip no longer closes Idle.
    Original patch by Roger Serwy.