mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-20 11:33:09 -08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

Browse source
This commit is contained in:
Eli Zaretskii 2021-11-07 17:03:33 +02:00
commit 93ee666c09
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/international/emoji.el
View file

@ -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:

2
lisp/xwidget.el
View file

@ -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))

12
src/xwidget.c
View file

@ -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