bug#51652: 29.0.50; [PATCH] Fix C-r inside xwidget isearch

bug#51652: 29.0.50; [PATCH] Fix C-r inside xwidget isearch

[Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors]

[-- Attachment #1: Type: text/plain, Size: 100 bytes --]

I missed this as well.  Sorry about that.  I hope these tickets aren't
being too annoying, thanks.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-C-r-inside-xwidget-isearch.patch --]
[-- Type: text/x-patch, Size: 821 bytes --]

From 58656bb269e58eaaf7b83863e6ed5e34f4285f40 Mon Sep 17 00:00:00 2001
From: Po Lu <luangruo@yahoo.com>
Date: Sun, 7 Nov 2021 14:22:52 +0800
Subject: [PATCH] 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 1e169d5650..74c236808a 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -886,7 +886,7 @@ xwidget-webkit-isearch-backward
       (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))
 
-- 
2.31.1

bug#51652: Acknowledgement (29.0.50; [PATCH] Fix C-r inside xwidget isearch)

[Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors]

[-- Attachment #1: Type: text/plain, Size: 705 bytes --]

help-debbugs@gnu.org (GNU bug Tracking System) writes:

> Thank you for filing a new bug report with debbugs.gnu.org.
>
> This is an automatically generated reply to let you know your message
> has been received.
>
> Your message is being forwarded to the package maintainers and other
> interested parties for their attention; they will reply in due course.
>
> Your message has been sent to the package maintainer(s):
>  bug-gnu-emacs@gnu.org
>
> If you wish to submit further information on this problem, please
> send it to 51652@debbugs.gnu.org.
>
> Please do not send mail to help-debbugs@gnu.org unless you wish
> to report a problem with the Bug-tracking system.

Here's something else I caught:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Free-find-text-in-correct-procedure.patch --]
[-- Type: text/x-patch, Size: 1324 bytes --]

From 518f879a2ee2c0fb355187de7bdca0e67fe07aca Mon Sep 17 00:00:00 2001
From: Po Lu <luangruo@yahoo.com>
Date: Sun, 7 Nov 2021 14:28:37 +0800
Subject: [PATCH] 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 7944ca5c4b..5384938461 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -2001,12 +2001,6 @@ DEFUN ("xwidget-webkit-previous-result", Fxwidget_webkit_previous_result,
   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
 
@@ -2039,6 +2033,12 @@ DEFUN ("xwidget-webkit-finish-search", Fxwidget_webkit_finish_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
 
-- 
2.31.1


[-- Attachment #3: Type: text/plain, Size: 39 bytes --]


Thanks.  And sorry for all the noise.

bug#51652: 29.0.50; [PATCH] Fix C-r inside xwidget isearch

[Lars Ingebrigtsen]

Po Lu <luangruo@yahoo.com> writes:

> I missed this as well.  Sorry about that.  I hope these tickets aren't
> being too annoying, thanks.

Po Lu <luangruo@yahoo.com> writes:

> Here's something else I caught:
>
> Thanks.  And sorry for all the noise.

Thanks; both patches applied.  And it's not annoying at all.  😀  It's
fantastic having somebody maintaining and continuing development of the
xwidgets stuff, which has been lying fallow for some time now.  So thank
you for doing this.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no