> Both changes LGTM, so I'll push them in the coming week if there are no
> other comments before then and no-one beats me to it.

Very good, thanks.

> But could you please first amend the commit messages to mention their
> bug#numbers and list file names relative to the project root,
> i.e. lisp/bookmark.el instead of bookmark.el?

Sure, I've attached a fixed patch here and I'll send new versions of
the others too.

Thanks,