From: Jason Rumney <jasonr@gnu.org>
Date: Thu, 17 Jan 2002 19:29:24 +0000 (+0000)
Subject: Only require fontset when new-fontset is bound.
X-Git-Tag: ttn-vms-21-2-B4~17096
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=64f41d64a959b03661aec0fc734a39c275b384fa;p=emacs.git

Only require fontset when new-fontset is bound.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4fe36bccb12..f2b99c23a28 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-17  Jason Rumney  <jasonr@gnu.org>
+
+	* term/w32-win.el: Restore conditional require of fontset.
+
 2002-01-16  Richard M. Stallman  <rms@gnu.org>
 
 	* mouse.el (mouse-drag-region-1): Renamed from mouse-drag-region,
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 2f7cb28608c..a31cf3c9d76 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -76,7 +76,8 @@
 (require 'faces)
 (require 'select)
 (require 'menu-bar)
-(require 'fontset)
+(if (fboundp 'new-fontset)
+    (require 'fontset))
 
 ;; The following definition is used for debugging scroll bar events.
 ;(defun w32-handle-scroll-bar-event (event) (interactive "e") (princ event))