@codebrainz Correct, intention is **1**. I closed the old PR because of the branch issue **and** because I changed the PL to also apply to _Search > Find in Files_.
If I understand your patch correct, it would change the default behaviour to do exactly that what my PL does, but per default and without a hidden preference. This is of course up to you, but I think a hidden preference may be better than changing the default behaviour without allowing users to fall back to the old default behaviour. My PL would resolve this issue. We could also just change the default value for _search.always_set_from_selected_ from _false_ to _true_.