Here is a new version introducing a `let' form spanning everything needed. There is no need for two calls to `getenv' anymore. I've attached the patch in two versions: with and without whitespace changes (git diff -b), to make it easier to review. Thanks, François On Wed, Apr 1, 2015 at 11:03 PM, Stefan Monnier wrote: >> 1- add one (which might be the most correct implementation, but >> generates a very large patch for mostly unchanged lines) > > That's the better option. > You can ask diff to ignore whitespace changes, which keeps the patch readable. > > > Stefan