*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1c76db799633a1b1f32d2282817446da65868c68..d254f82f494dcdf43107ffe144d74147763030a7 100644 (file)
--- 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 ca8cb293e782bcc4c077c26e633d9df6e9e4dda3..d199fb6321eb889cfce1286be6f8a6307a24e089 100644 (file)
--- 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>