nkf 2.1.3

Also use inreplace and make variables to avoid needing a patch.

Fixes #24860.