(Fx_font_family_list): Replace lisp/term/pc-win.el redefinition with

ifdef.  (Bug#1383)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bef08cdb6b1993e32e94c45ede2a8d64d4748453..fba20bb915aa3f255e5587289d59549c6b335acf 100644 (file)
--- 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 862711a7797d8ed1462f2ec1df6b27a2570885f2..905ea2729ad82a4535e1e15c74386dce323b5e69 100644 (file)
--- 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 68d63d690d996576054a0a910b8089197f0f2d69..31f56df6ab9d6c848e952ee13ce1d52c4f9dc29a 100644 (file)
--- 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
 }