Would anyone mind me pushing this to emacs-30?

[...]


-- 
	Philip Kaludercic on siskin