From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 15 Nov 2000 19:25:57 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~48
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6d133d1f9be6dec57aa3e35d9814b673d3966b78;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 87eab43f502..0a966a4f06c 100644
--- 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 76d96f7bb39..477002db4f1 100644
--- 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.