Only require fontset when new-fontset is bound.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4fe36bccb121d37126b8cccd7573fc81ddb59423..f2b99c23a28a4210281ff02be94542f185b56923 100644 (file)
--- 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 2f7cb28608c50bfd29f388c67140dc2086fa2f2b..a31cf3c9d762e6e461ba8c908899585f45d3e157 100644 (file)
--- 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))