[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 93ee666 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/g
From: |
Eli Zaretskii |
Subject: |
master 93ee666 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs |
Date: |
Sun, 7 Nov 2021 10:03:50 -0500 (EST) |
branch: master
commit 93ee666c091feceaa2a90c46e29314723add8d07
Merge: 4fdbd72 42fd5f2
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
lisp/international/emoji.el | 4 +++-
lisp/xwidget.el | 2 +-
src/xwidget.c | 12 ++++++------
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/lisp/international/emoji.el b/lisp/international/emoji.el
index bf0f818..f95a9e7 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:
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 4bd2be2..1d91e86 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))
diff --git a/src/xwidget.c b/src/xwidget.c
index b0700b6..f95f5f1 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 93ee666 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs,
Eli Zaretskii <=