From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 7 Aug 1997 17:33:49 +0000 (+0000)
Subject: (x-list-fonts): Return "default" when appropriate.
X-Git-Tag: emacs-20.1~736
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cee30b8f9d1a148098c9cd532bc3ca8e339e41af;p=emacs.git

(x-list-fonts): Return "default" when appropriate.
(query-fontset): Add (alternative) alias definition.
---

diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index fccb693c452..8ee6a0b88de 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -260,7 +260,10 @@
 
 ;; From src/xfns.c
 (defun x-display-color-p (&optional display) 't)
-(defun x-list-fonts (pattern &optional face frame) (list "default"))
+(defun x-list-fonts (pattern &optional face frame maximum width)
+  (if (and (numberp width) (= width 1))
+      (list "default")
+    (list "no-such-font")))
 (defun x-color-defined-p (color) (numberp (msdos-color-translate color)))
 (defun x-display-pixel-width (&optional frame) (frame-width frame))
 (defun x-display-pixel-height (&optional frame) (frame-height frame))
@@ -351,6 +354,9 @@ This is in addition to the primary selection.")
 (defun x-frob-font-slant (font which)
   font)
 
+;; From src/fontset.c:
+(fset 'query-fontset 'ignore)
+
 ;; From lisp/term/x-win.el: make iconify-or-deiconify-frame a no-op.
 (fset 'iconify-or-deiconify-frame 'ignore)