From: Gerd Moellmann <gerd@gnu.org>
Date: Sat, 1 Apr 2000 12:25:00 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~4366
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=610d841ea4d397f151a86d4bfc1e0a8b9b1a646b;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1c76db79963..d254f82f494 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-31  Andrew Innes  <andrewi@gnu.org>
+
+	* vc.el (vc-backend-diff): Return the correct status if we had to
+	retry the rcsdiff command without the --brief option.
+	
 2000-03-31  Dave Love  <fx@gnu.org>
 
 	* help.el (help-manyarg-func-alist): Correct several omissions.
diff --git a/src/ChangeLog b/src/ChangeLog
index ca8cb293e78..d199fb6321e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-04-01  Gerd Moellmann  <gerd@gnu.org>
 
+	* xfaces.c (realize_basic_faces): Block input while realizing
+	the faces.
+
 	* keyboard.c (lispy_mouse_names): Add additional mouse names.
 
 	* termhooks.h (NUM_MOUSE_BUTTONS): Increase to 15.
@@ -7,7 +10,7 @@
 2000-03-31  Gerd Moellmann  <gerd@gnu.org>
 
 	* xterm.c (x_produce_glyphs): When displaying unibyte text
-	or ASCII, handle case that per-char metric is NULL.
+	or ASCII, handle case that per-char metric is null.
 
 2000-03-30  Ken Raeburn  <raeburn@gnu.org>