# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1142689785 0
# Node ID 7490df7958b2f3906e02b2bd6fc41ee224a71594
# Parent  78c97c8a848373501a4688a2ba493156161f0fa6
*** empty log message ***

diff -r 78c97c8a8483 -r 7490df7958b2 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Mar 18 13:49:11 2006 +0000
+++ b/lisp/ChangeLog	Sat Mar 18 13:49:45 2006 +0000
@@ -1,3 +1,8 @@
+2006-03-18  Eli Zaretskii  <eliz@gnu.org>
+
+	* term/w32-win.el (mouse-set-font): Mention
+	w32-list-proportional-fonts in the doc string.
+
 2006-03-18  Kim F. Storm  <storm@cua.dk>
 
 	* ido.el (ido-cache-ftp-work-directory-time): Doc fix.
diff -r 78c97c8a8483 -r 7490df7958b2 src/ChangeLog
--- a/src/ChangeLog	Sat Mar 18 13:49:11 2006 +0000
+++ b/src/ChangeLog	Sat Mar 18 13:49:45 2006 +0000
@@ -1,3 +1,12 @@
+2006-03-18  Vivek Dasmohapatra  <vivek@etla.org>  (tiny change)
+
+	* emacs.c (main): If user asks for a display that is unavailable,
+	simulate -nw.
+
+	* xterm.c (x_display_ok): New function.
+
+	* xterm.h: Add prototype for x_display_ok.
+
 2006-03-18  Eli Zaretskii  <eliz@gnu.org>
 
 	* w32fns.c (Fw32_select_font): Doc fix.