[PATCH 21.5] Pass a device to x-font-menu-font-data-xft

PATCH 21.5 This fixes a problem reported by Giacomo Boffi. The function x-font-menu-font-data-xft expects its 4th argument to be a device. However, when font-menu-this-frame-only-p is non-nil, x-font-men-font-data passes a frame as the 4th argument. This patch ensures that a device is always passed. lisp/ChangeLog addition: 2006-05-10 Jerry James <james(a)xemacs.org&gt; * x-font-menu.el (x-font-menu-font-data): Always pass a device as the 4th argument to x-font-menu-font-data-xft. xemacs-21.5 source patch: Diff command: cvs -q diff -uN Files affected: lisp/x-font-menu.el Index: lisp/x-font-menu.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/x-font-menu.el,v retrieving revision 1.16 diff -d -u -r1.16 x-font-menu.el --- lisp/x-font-menu.el 2006/04/25 14:01:54 1.16 +++ lisp/x-font-menu.el 2006/05/10 15:08:56 ＠＠ -270,7 +270,7 ＠＠ ;; #### this call to x-font-menu-font-data-core originally ;; had 4 args, and that's probably the right way to go (x-font-menu-font-data-core face dcache) - (x-font-menu-font-data-xft face dcache name domain)) + (x-font-menu-font-data-xft face dcache name (selected-device))) ;; #### this one, too (x-font-menu-font-data-core face dcache)))) -- Jerry James, Assistant Professor james(a)xemacs.org Computer Science Department http://www.cs.usu.edu/~jerry/ Utah State University