Rebase after pushes

comm-central/patches/TOP-1611010-DOMEventListener-cc.patch

@@ -1,7 +1,7 @@
 # HG changeset patch
 # User Ian Neal <iann_cvs@blueyonder.co.uk>
 # Date 1579738200 -3600
-# Parent  da7fc6c17732f09402c2596a4bb56c5d33d8c6f4
+# Parent  96b44ea5a7df63aad0f86c842073aac475a45b50
 Bug 1611010 - Port |Bug 1453345 part 5 - Remove pointless JS implementaions of QI to nsIDOMEventListener| and |Bug 1453487 part 2 - Remove useless implements="nsIDOMEventListener" from XBL bindings| to SeaMonkey. r=frg
 
 diff --git a/suite/base/content/viewZoomOverlay.js b/suite/base/content/viewZoomOverlay.js
@@ -111,7 +111,7 @@ diff --git a/suite/browser/nsTypeAheadFind.js b/suite/browser/nsTypeAheadFind.js
 diff --git a/suite/browser/tabbrowser.xml b/suite/browser/tabbrowser.xml
 --- a/suite/browser/tabbrowser.xml
 +++ b/suite/browser/tabbrowser.xml
-@@ -3343,17 +3343,17 @@
+@@ -3382,17 +3382,17 @@
                </xul:hbox>
              </xul:stack>
            </xul:hbox>
@@ -130,7 +130,7 @@ diff --git a/suite/browser/tabbrowser.xml b/suite/browser/tabbrowser.xml
            tab.style.minWidth = Services.prefs.getIntPref("browser.tabs.tabMinWidth") + "px";
            tab.style.maxWidth = Services.prefs.getIntPref("browser.tabs.tabMaxWidth") + "px";
            window.addEventListener("resize", this);
-@@ -3502,17 +3502,17 @@
+@@ -3541,17 +3541,17 @@
            this._handleMouseScroll(event);
          ]]>
        </handler>

comm-central/patches/TOP-1611647-2-fix-xul-references-suite.patch

@@ -3,7 +3,7 @@
 # Date 1641471337 18000
 #      Thu Jan 06 07:15:37 2022 -0500
 # Node ID b26cee1637d4d447b316f7466fd88cf523119dc4
-# Parent  5b32f73fa7543038023e3cca9e0f0ffe246553df
+# Parent  8d6f5b2f7da23339c8ee67bad4f3e2dac2fb5d5f
 Bug 1611647 - Port bug 1579952 - Fix references to xul files in suite.
 
 diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
@@ -30,7 +30,7 @@ diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
  pref("general.startup.mail",                false);
  pref("general.startup.news",                false);
  pref("general.startup.editor",              false);
-@@ -748,18 +748,18 @@ pref("privacy.clearOnShutdown.siteSettin
+@@ -749,18 +749,18 @@ pref("privacy.clearOnShutdown.siteSettin
  pref("privacy.warn_tracking_content", true);
  
  // Switching this on will also spoof our user agent and other potentially
@@ -328,7 +328,7 @@ diff --git a/suite/base/content/utilityOverlay.js b/suite/base/content/utilityOv
      }
      else if (buttonID == "getMeOutOfHereButton") {
        // Redirect them to a known-functioning page, default start page
-@@ -1786,17 +1786,17 @@ function subscribeToFeedMiddleClick(href
+@@ -1787,17 +1787,17 @@ function subscribeToFeedMiddleClick(href
  }
  
  function OpenSearchEngineManager() {
@@ -4958,7 +4958,7 @@ diff --git a/suite/mailnews/content/ABSearchDialog.xhtml b/suite/mailnews/conten
 diff --git a/suite/mailnews/content/FilterListDialog.js b/suite/mailnews/content/FilterListDialog.js
 --- a/suite/mailnews/content/FilterListDialog.js
 +++ b/suite/mailnews/content/FilterListDialog.js
-@@ -300,17 +300,17 @@ function onEditFilter()
+@@ -307,17 +307,17 @@ function onEditFilter()
      return;
  
    var selectedFilter = currentFilter();
@@ -4971,13 +4971,13 @@ diff --git a/suite/mailnews/content/FilterListDialog.js b/suite/mailnews/content
 +  window.openDialog("chrome://messenger/content/FilterEditor.xhtml", "FilterEditor", "chrome,modal,titlebar,resizable,centerscreen", args);
  
    if ("refresh" in args && args.refresh) {
+     // Reset search if edit was okay (name change might lead to hidden entry).
+     resetSearchBox(selectedFilter);
      rebuildFilterList();
    }
  }
  
- /**
-  * Handler function for the 'New...' buttons.
-@@ -358,17 +358,17 @@ function calculatePositionAndShowCreateF
+@@ -367,17 +367,17 @@ function calculatePositionAndShowCreateF
          break;
        }
      }
@@ -4993,12 +4993,12 @@ diff --git a/suite/mailnews/content/FilterListDialog.js b/suite/mailnews/content
  
    if (args.refresh)
    {
+     // On success: reset the search box if necessary!
+     resetSearchBox(args.newFilter);
      rebuildFilterList();
+@@ -530,17 +530,17 @@ function moveFilter(motion) {
  
-     // Select the new filter, it is at the position of previous selection.
-@@ -489,17 +489,17 @@ function moveFilter(motion) {
- 
-   moveCurrentFilter(moveFilterNative);
+   rebuildFilterList();
  }
  
  function viewLog()

comm-central/patches/TOP-1614671-port1456035-4-and-5-61a1-cc.patch

@@ -1,7 +1,7 @@
 # HG changeset patch
 # User Ian Neal <iann_cvs@blueyonder.co.uk>
 # Date 1581435120 -3600
-# Parent  91d5d2688296b4171a18cf79669eb2bbba08e6f3
+# Parent  00a0aee4349656ab489a2873cb5ff99eb32d98db
 Bug 1614671 - Port |Bug 1456035 Part 4 - Convert callers of XPCOMUtils.generateQI to ChromeUtils.generateQI|, |Bug 1456035 Part 5 - Convert manual QueryInterface to ChromeUtils.generateQI| and |Bug 1460092 - Add ESLint rule to enforce use of ChromeUtils.generateQI| to SeaMonkey. r=frg
 
 diff --git a/suite/base/content/viewZoomOverlay.js b/suite/base/content/viewZoomOverlay.js
@@ -257,7 +257,7 @@ diff --git a/suite/browser/tabbrowser.xml b/suite/browser/tabbrowser.xml
        <method name="mInstallSH">
          <parameter name="aBrowser"/>
          <parameter name="aSH"/>
-@@ -802,24 +798,19 @@
+@@ -801,24 +797,19 @@
              onStatusChange : function(aWebProgress, aRequest, aStatus, aMessage)
              {
              },

comm-central/patches/TOP-1684772-l10n-toml-cc.patch

@@ -1,7 +1,7 @@
 # HG changeset patch
 # User Ian Neal <iann_cvs@blueyonder.co.uk>
 # Date 1609700583 0
-# Parent  9df31f6cc2e1f892fcbe456c112a49686016095e
+# Parent  422afe48b5960cf2e2b06e9f0973fc2a2993a0b4
 Bug 1684772 - Move editor/ui into suite/editor - l10n.toml changes for older branches. r=frg
 
 diff --git a/mail/locales/l10n.toml b/mail/locales/l10n.toml