*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 87eab43f502d9c38437ed2f4fddd1e4b1d92e27f..0a966a4f06cc339c684e1dc951f6a7b1782b6560 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-15  Gerd Moellmann  <gerd@gnu.org>
+
+       * faces.el (face-set-after-frame-default): If
+       `inhibit-default-face-x-resources' is bound, don't intiialize the
+       default face from X resources.
+
 2000-11-15  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * Makefile.in (custom-deps, finder-data, autoloads, recompile):

diff --git a/src/ChangeLog b/src/ChangeLog
index 76d96f7bb395c7939620fcff7a09f3e08368d8d2..477002db4f1819bf28c2bb174e5f26b047439768 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,14 @@
 2000-11-15  Gerd Moellmann  <gerd@gnu.org>
 
+       * frame.c (syms_of_frame_1): Removed; code moved to syms_of_frame.
+       (Qinhibit_default_face_x_resources): New variable.
+       (syms_of_frame): Initialize it.
+       (Fmodify_frame_parameters): Bind inhibit-default-face-x-resources.
+
+       * xdisp.c (pos_visible_p): Improve function comment.
+
+       * lisp.h (BINDING_STACK_SIZE): New macro.
+
        * dired.c (directory_files_internal) [EAGAIN || EINTR]: Retry
        reading the directory if readdir returns null and errno is EAGAIN
        or EINTR.