As always I have split out the generic parts. This also includes the expand-file-name usage changes suggested by Hrvoje. I will apply this to cvs. andy 1999-05-30 Andy Piper <andy(a)xemacs.org&gt; * msw-faces.el (mswindows-font-regexp): new font matching regexp for use by the font menu. * msw-font-menu.el: new file implementing mswindows specific font-menu behaviour. (mswindows-font-menu-registry-encoding): new function mirroring x version. (mswindows-font-menu-junk-families): ditto. (hack-font-truename): ditto. (mswindows-font-regexp-ascii): ditto. (mswindows-reset-device-font-menus): ditto. (mswindows-font-menu-font-data): ditto. (mswindows-font-menu-load-font): ditto. * x-font-menu.el (x-reset-device-font-menus): made device specific. (x-font-menu-font-data): ditto. (x-font-menu-load-font): ditto. * font-menu.el: new file implementing generic font menu behaviour. (font-menu-ignore-scaled-fonts): copied from x-font-menu.el and made device independent. (font-menu-this-frame-only-p): ditto. (font-menu-preferred-resolution): ditto. (font-menu-size-scaling): new variable used to determine whether sizes are in points or tenths of a point. (vassoc): moved from x-font-menu.el. (device-fonts-cache): ditto. (device-fonts-cache): ditto. (flush-device-fonts-cache): ditto. (reset-device-font-menus): copied from x-font-menu.el and made device independent. Most functionality deferred to device-dependent versions. (font-menu-family-constructor): copied from x-font-menu.el and made device independent. (font-menu-size-constructor): ditto. (font-menu-weight-constructor): ditto. (font-menu-set-font): ditto. (font-menu-change-face): ditto. (font-menu-load-font): new device method. (font-menu-font-data): ditto. * x-font-menu.el: The above functions deleted. 1999-05-26 Andy Piper <andy(a)xemacs.org&gt; * update-elc.el: * make-docfile.el: * loadup.el: rehash expand-file-name usage to not use default-directory.