Merge branch 'tr/grep-l-with-decoration' into maint

* tr/grep-l-with-decoration:
grep: fix -l/-L interaction with decoration lines