Add xwidget-webkit-isearch-yank-kill

Add xwidget-webkit-isearch-yank-kill

[Po Lu]

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

I added a command that behaves like `isearch-yank-kill' to xwidget
webkit isearch.

Does anyone want to make a comment before I push it?  Thanks.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Add-xwidget-webkit-isearch-yank-kill.patch --]
[-- Type: text/x-patch, Size: 2314 bytes --]

From 108b234ec7d4b00e08786c0f0a17514ea50951a0 Mon Sep 17 00:00:00 2001
From: Po Lu <luangruo@yahoo.com>
Date: Wed, 10 Nov 2021 18:13:22 +0800
Subject: [PATCH] Add `xwidget-webkit-isearch-yank-kill'

* lisp/xwidget.el: Bind C-y to xwidget-webkit-yank-kill in incremental
search.
(xwidget-webkit-isearch-mode): Update doc string.
(xwidget-webkit-yank-kill): New function.
---
 lisp/xwidget.el | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index cad464b5b2..cc149cf197 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -947,6 +947,7 @@ xwidget-webkit-isearch-mode-map
 (define-key xwidget-webkit-isearch-mode-map "\C-g" 'xwidget-webkit-isearch-exit)
 (define-key xwidget-webkit-isearch-mode-map "\C-r" 'xwidget-webkit-isearch-backward)
 (define-key xwidget-webkit-isearch-mode-map "\C-s" 'xwidget-webkit-isearch-forward)
+(define-key xwidget-webkit-isearch-mode-map "\C-y" 'xwidget-webkit-isearch-yank-kill)
 (define-key xwidget-webkit-isearch-mode-map "\t" 'xwidget-webkit-isearch-printing-char)
 
 (let ((meta-map (make-keymap)))
@@ -968,6 +969,9 @@ xwidget-webkit-isearch-mode
 \\<xwidget-webkit-isearch-mode-map>\\[xwidget-webkit-isearch-forward] to move forward, and
 \\<xwidget-webkit-isearch-mode-map>\\[xwidget-webkit-isearch-backward] to move backward.
 
+To insert the string at the front of the kill ring into the
+search query, type \\<xwidget-webkit-isearch-mode-map>\\[xwidget-webkit-isearch-yank-kill].
+
 Press \\<xwidget-webkit-isearch-mode-map>\\[xwidget-webkit-isearch-exit] to exit incremental search."
   :keymap xwidget-webkit-isearch-mode-map
   (if xwidget-webkit-isearch-mode
@@ -977,6 +981,15 @@ xwidget-webkit-isearch-mode
         (xwidget-webkit-isearch--update))
     (xwidget-webkit-finish-search (xwidget-webkit-current-session))))
 
+(defun xwidget-webkit-isearch-yank-kill ()
+  "Pull string from kill ring and append it to the current query."
+  (interactive)
+  (unless xwidget-webkit-isearch-mode
+    (xwidget-webkit-isearch-mode t))
+  (setq xwidget-webkit-isearch--string
+        (concat xwidget-webkit-isearch--string
+                (current-kill 0)))
+  (xwidget-webkit-isearch--update))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defvar xwidget-view-list)              ; xwidget.c
-- 
2.31.1

Re: Add xwidget-webkit-isearch-yank-kill

[Po Lu]

Po Lu <luangruo@yahoo.com> writes:

> I added a command that behaves like `isearch-yank-kill' to xwidget
> webkit isearch.
>
> Does anyone want to make a comment before I push it?  Thanks.

Hmm, I think it should be OK to push it, so that's now done.

If anyone else has a comment on it, be sure to let me know.  And I hope
I'm not being to hasty here, thanks.

Re: Add xwidget-webkit-isearch-yank-kill

[Lars Ingebrigtsen]

Po Lu <luangruo@yahoo.com> writes:

> If anyone else has a comment on it, be sure to let me know.  And I hope
> I'm not being to hasty here, thanks.

It's customary to give people at least a day (or two) to comment.  😀
But the patch looks OK to me.

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

Re: Add xwidget-webkit-isearch-yank-kill

[Po Lu]

Lars Ingebrigtsen <larsi@gnus.org> writes:

> It's customary to give people at least a day (or two) to comment.  😀

Okay, thanks.  I'll keep that in mind in the future.

Re: Add xwidget-webkit-isearch-yank-kill

[Eli Zaretskii]

> From: Po Lu <luangruo@yahoo.com>
> Date: Wed, 10 Nov 2021 19:43:07 +0800
> 
> Po Lu <luangruo@yahoo.com> writes:
> 
> > I added a command that behaves like `isearch-yank-kill' to xwidget
> > webkit isearch.
> >
> > Does anyone want to make a comment before I push it?  Thanks.
> 
> Hmm, I think it should be OK to push it, so that's now done.
> 
> If anyone else has a comment on it, be sure to let me know.  And I hope
> I'm not being to hasty here, thanks.

Please leave some reasonable time for people to chime in and comment
on your patches.  We don't all of us are on-line all the time; some of
us have lives outside of the project as well.

The rule of thumb I propose is to wait for at least one day, possibly
two or three, before you decide that no one has anything to say.

TIA

Re: Add xwidget-webkit-isearch-yank-kill

[Eli Zaretskii]

> From: Po Lu <luangruo@yahoo.com>
> Date: Wed, 10 Nov 2021 18:15:47 +0800
> 
> I added a command that behaves like `isearch-yank-kill' to xwidget
> webkit isearch.
> 
> Does anyone want to make a comment before I push it?  Thanks.

Thanks, I have a few minor comments:

> * lisp/xwidget.el: Bind C-y to xwidget-webkit-yank-kill in incremental

This line is too long.  We produce ChangeLog from the Git log, where
each entry has a TAB before it.  So each line in the commit log
message should not be longer than 66 characters, because ChangeLog
entries wrap at column 74.

> +(defun xwidget-webkit-isearch-yank-kill ()
> +  "Pull string from kill ring and append it to the current query."
           ^^^^^^
Which string?  I think you mean the most recent kill, don't you?

Re: Add xwidget-webkit-isearch-yank-kill

[Po Lu]

Eli Zaretskii <eliz@gnu.org> writes:

Apologies for pushing the patch in haste.  This will not happen again.

>> * lisp/xwidget.el: Bind C-y to xwidget-webkit-yank-kill in incremental

> This line is too long.  We produce ChangeLog from the Git log, where
> each entry has a TAB before it.  So each line in the commit log
> message should not be longer than 66 characters, because ChangeLog
> entries wrap at column 74.

Oops, sorry.  I assumed that M-q in a *vc-log* buffer would fill these
entries correctly, but I guess I'm wrong.

>> +(defun xwidget-webkit-isearch-yank-kill ()
>> +  "Pull string from kill ring and append it to the current query."
>            ^^^^^^
> Which string?  I think you mean the most recent kill, don't you?

Yes, what would you suggest I change it to?

Re: Add xwidget-webkit-isearch-yank-kill

[Eli Zaretskii]

> From: Po Lu <luangruo@yahoo.com>
> Cc: emacs-devel@gnu.org
> Date: Thu, 11 Nov 2021 08:28:53 +0800
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> >> +(defun xwidget-webkit-isearch-yank-kill ()
> >> +  "Pull string from kill ring and append it to the current query."
> >            ^^^^^^
> > Which string?  I think you mean the most recent kill, don't you?
> 
> Yes, what would you suggest I change it to?

How about this:

  "Append the most recent kill from `kill-ring' to the current query."

Re: Add xwidget-webkit-isearch-yank-kill

[Po Lu]

Eli Zaretskii <eliz@gnu.org> writes:

>   "Append the most recent kill from `kill-ring' to the current query."

I'll push it in a bit if nobody else has anything to add here.

Thanks :)