From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 5 Jul 2000 13:14:36 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~2976
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=969f7e79eb7dd72f72e34a308ff96e427daacaf4;p=emacs.git

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

diff --git a/ChangeLog b/ChangeLog
index f3005dd2dc4..ad1cfe15557 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-05  Gerd Moellmann  <gerd@gnu.org>
+
+	* make-dist: Check DONTCOMPILE in lisp/Makefile.in instead of
+	lisp/Makefile.  Distribute lisp/Makefile.in instead of
+	lisp/Makefile.
+
 2000-06-30  Ken Raeburn  <raeburn@gnu.org>
 
 	* configure.in: Add ${C_SWITCH_X_SITE} temporarily to CPPFLAGS,
diff --git a/man/programs.texi b/man/programs.texi
index 3fa4e0c29a9..2413a00819e 100644
--- a/man/programs.texi
+++ b/man/programs.texi
@@ -1124,11 +1124,9 @@ style for the other C-like modes.
 
   The style @code{gnu} defines the formatting recommend by the GNU
 Project; it is the default, so as to encourage the indentation we
-recommend.  The style @code{user} is the same as @code{gnu} but
-incorporates any changes made in variables such as @code{c-basic-offset}
-and @code{c-offsets-alist} by your @file{~/.emacs} file.  To make them
-take effect, you should select the style @code{user} with
-@code{c-set-style} or @code{c-default-style}.
+recommend. If you make changes in variables such as
+@code{c-basic-offset} and @code{c-offsets-alist} in your @file{~/.emacs}
+file, they will however take precedence.
 
 @findex c-add-style
   To define a new C indentation style, call the function
diff --git a/src/ChangeLog b/src/ChangeLog
index c0de99fbb87..89af37f2cb2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2000-07-05  Gerd Moellmann  <gerd@gnu.org>
 
+	* eval.c (Feval): Put check for interrupt_input_block in #if 0.
+
 	* window.c (delete_all_subwindows): Reset Vwindow_list.
 
 	* xterm.c (x_append_glyph, x_append_composite_glyph)