And the correponding patch against emacs-26: