Mercurial > emacs
changeset 30049:be64b32cd2a2
*** empty log message ***
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Wed, 05 Jul 2000 13:14:36 +0000 |
| parents | 349704f6532f |
| children | ed1979c6dfb9 |
| files | ChangeLog man/programs.texi src/ChangeLog |
| diffstat | 3 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jul 05 12:39:03 2000 +0000 +++ b/ChangeLog Wed Jul 05 13:14:36 2000 +0000 @@ -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,
--- a/man/programs.texi Wed Jul 05 12:39:03 2000 +0000 +++ b/man/programs.texi Wed Jul 05 13:14:36 2000 +0000 @@ -1124,11 +1124,9 @@ 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
--- a/src/ChangeLog Wed Jul 05 12:39:03 2000 +0000 +++ b/src/ChangeLog Wed Jul 05 13:14:36 2000 +0000 @@ -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)