[Bug: 21.5-b27] calendar

[Marcus Harnisch]

================================================================
Dear Bug Team!

With my Xft-pimped XEmacs I came across a bug in calendar (1.23). I am
absolutely puzzled why I haven't encountered this earlier.

Reproduce by:

1. Start xemacs -vanilla

2. Type M-x calendar

3. Type C-h l and check out the warning which will look similar to this:

,----
| Wrong type argument: stringp, #<font-instance "DejaVu Sans Mono-12" on #<x-device on ":0.0" 0x58dd4> xft font: 0x17bfa50 0x5fad2>
| Loading calendar...
`----

The problem seems to be the return value of `face-font-instance', that
is passed as argument to `x-make-font-bold'. The latter, however,
doesn't expect a font-instance but a font name instead. A patch that
works for me puts a call to `font-instance-name' in between the two
function calls.

Regards,
Marcus

--- calendar.el.orig    2003-08-28 08:57:28.000000000 +0200
+++ calendar.el 2006-06-03 15:45:14.000000000 +0200
@@ -207,7 +207,7 @@
             ;; in batch mode.
             (if (and (not noninteractive) (fboundp 'x-make-font-bold))
                 (let ((bfont (x-make-font-bold
-                              (face-font-instance 'default)))
+                              (font-instance-name (face-font-instance 'default))))
                       (mono-tag (list 'x 'mono))
                       (gray-tag (list 'x 'grayscale)))
                   (if bfont