From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 18 Mar 2006 13:49:45 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~3538
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7e37c7c0019545a181ddf54919651fe644e01f25;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 416675462db..97ec26923d3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 3bd4d91abbb..414a01efb93 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.