From 397bee1dc3d33d48abb3f6ab3483fa10b4d4ec1f Mon Sep 17 00:00:00 2001
From: Po Lu <luangruo@yahoo.com>
Date: Sun, 7 Nov 2021 14:22:52 +0800
Subject: [PATCH 1/3] Fix C-r inside xwidget isearch

* lisp/xwidget.el (xwidget-webkit-isearch-backward): Ask for previous
result.
---
 lisp/xwidget.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 4bd2be2c264..1d91e863e42 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -886,7 +886,7 @@ With argument, add COUNT copies of CHAR."
       (xwidget-webkit-isearch--update)))
   (let ((i 0))
     (while (< i count)
-      (xwidget-webkit-next-result (xwidget-webkit-current-session))
+      (xwidget-webkit-previous-result (xwidget-webkit-current-session))
       (cl-incf i)))
   (xwidget-webkit-isearch--update t))
 

From 73d17fd4b7877c893f0ca09c9f8f93ce66c7643a Mon Sep 17 00:00:00 2001
From: Po Lu <luangruo@yahoo.com>
Date: Sun, 7 Nov 2021 14:28:37 +0800
Subject: [PATCH 2/3] Free find text in correct procedure

* src/xwidget.c (Fxwidget_webkit_previous_result): Don't free find
text.
(Fxwidget_webkit_finish_search): Free find text here instead.
---
 src/xwidget.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/xwidget.c b/src/xwidget.c
index b0700b61e54..f95f5f1d7f7 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -2025,12 +2025,6 @@ using `xwidget-webkit-search'.  */)
   webview = WEBKIT_WEB_VIEW (xw->widget_osr);
   controller = webkit_web_view_get_find_controller (webview);
   webkit_find_controller_search_previous (controller);
-
-  if (xw->find_text)
-    {
-      xfree (xw->find_text);
-      xw->find_text = NULL;
-    }
   unblock_input ();
 #endif
 
@@ -2063,6 +2057,12 @@ using `xwidget-webkit-search'.  */)
   webview = WEBKIT_WEB_VIEW (xw->widget_osr);
   controller = webkit_web_view_get_find_controller (webview);
   webkit_find_controller_search_finish (controller);
+
+  if (xw->find_text)
+    {
+      xfree (xw->find_text);
+      xw->find_text = NULL;
+    }
   unblock_input ();
 #endif
 

From 42fd5f27898317dfc261dc57904750d7f65b97ea Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 7 Nov 2021 15:31:40 +0100
Subject: [PATCH 3/3] Don't inhibit compilation of emoji.elc

* lisp/international/emoji.el (emoji--generate-file): Further
obfuscate to not inhibit byte compilation.
---
 lisp/international/emoji.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/international/emoji.el b/lisp/international/emoji.el
index bf0f81890ac..f95a9e79c4e 100644
--- a/lisp/international/emoji.el
+++ b/lisp/international/emoji.el
@@ -382,7 +382,9 @@ character) under point is."
     (insert ";; Local" " Variables:
 ;; coding: utf-8
 ;; version-control: never
-;; no-byte-compile: t
+;; no-byte-"
+            ;; Obfuscate to not inhibit compilation of this file, too.
+            "compile: t
 ;; no-update-autoloads: t
 ;; End: