*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 416675462db5aa2eaa1ed381e2d3859b6696dfe8..97ec26923d3ce072538f21af568fa0ede09fa198 100644 (file)
--- 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 3bd4d91abbbb6cac3c5edf9b0253d6899049958d..414a01efb93236e90ce3fb1ca02eef9c7d0e7ce6 100644 (file)
--- 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.