From: Glenn Morris <rgm@gnu.org>
Date: Wed, 26 Nov 2008 03:00:53 +0000 (+0000)
Subject: (Fx_font_family_list): Replace lisp/term/pc-win.el redefinition with
X-Git-Tag: emacs-pretest-23.0.90~1520
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9f688acf323a27f4fae650061768152f92411692;p=emacs.git

(Fx_font_family_list): Replace lisp/term/pc-win.el redefinition with
ifdef.  (Bug#1383)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bef08cdb6b1..fba20bb915a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2008-11-26  Glenn Morris  <rgm@gnu.org>
+
+	* vc-git.el (vc-git-diff-switches): New option.
+	(vc-git-diff): Apply diff switches.  (Bug#1386)
+	Give it a basic doc string.
+
+	* term/pc-win.el (x-font-family-list): Replace redefinition with
+	ifdef in src/xfaces.c, since it confuses make-docfile.  (Bug#1383)
+
 2008-11-26  Vincent Belaïche  <vincent.b.1@hotmail.fr>
 
 	* calc/calc-alg.el (calcFunc-collect): Normalize the coefficients
diff --git a/src/ChangeLog b/src/ChangeLog
index 862711a7797..905ea2729ad 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-26  Glenn Morris  <rgm@gnu.org>
+
+	* xfaces.c (Fx_font_family_list): Replace lisp/term/pc-win.el
+	redefinition with ifdef.  (Bug#1383)
+
 2008-11-24  Chong Yidong  <cyd@stupidchicken.com>
 
 	* minibuf.c (Fcompleting_read, Vminibuffer_completion_confirm):
diff --git a/src/xfaces.c b/src/xfaces.c
index 68d63d690d9..31f56df6ab9 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1839,7 +1839,11 @@ are fixed-pitch.  */)
      (frame)
      Lisp_Object frame;
 {
+#ifdef MSDOS
+  return Fcons (Fcons (build_string ("default"), Qt), Qnil);
+#else
   return Ffont_family_list (frame);
+#endif
 }