*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e7e56bc..ac44b13 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,33 @@
+2003-09-30  Richard M. Stallman  <rms@gnu.org>
+
+       * progmodes/ada-mode.el (ada-mode): Don't use advice.
+       Instead, set which-func-functions.
+
+       * progmodes/which-func.el (which-func-modes): Add ada-mode.
+       (which-func-functions): New variable.
+       (which-function): Use that.
+
+       * info.el (Info-mode): Double each `%' in header line.
+
+       * emacs-lisp/lisp-mnt.el (lm-with-file):
+       When FILE is nil, run BODY in current buffer.
+
+       * mail/emacsbug.el (report-emacs-bug): Mention major and minor modes.
+
+       * help.el (describe-mode): Start with a brief list of minor modes.
+       Find them thru minor-mode-list so as to find them all.
+       Show them in alphabetical order.
+
+       * mail/sendmail.el (mail-aliases): Doc fix.
+
+       * progmodes/sh-script.el (sh-mode-syntax-table): Add defvar.
+
+2003-09-30  Alexander Pohoyda  <alexander.pohoyda@gmx.net>  (tiny change)
+
+       * mail/rmailsum.el (rmail-make-summary-line-1):
+       Change comma after last label to a space.
+       (rmail-summary-font-lock-keywords): Adapt to that change.
+
 2003-09-30  Thien-Thi Nguyen  <ttn@gnu.org>
 
        * progmodes/scheme.el (scheme-mode-variables): When setting
@@ -197,6 +227,7 @@
        * progmodes/gud.el (perldb): Add gud-until to list of commands.
        Update gud-remove.
 
+>>>>>>> 1.5409
 2003-09-22  Richard M. Stallman  <rms@gnu.org>
 
        * progmodes/sh-script.el (sh-mode-default-syntax-table):

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 562a3d4..ebaaec2 100644 (file)
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-30  Richard M. Stallman  <rms@gnu.org>
+
+       * processes.texi (Network): Say what stopped datagram connections do.
+
+       * lists.texi (Association Lists): Clarify `assq-delete-all'.
+
+       * display.texi (Overlay Properties): Clarify `evaporate' property.
+
 2003-09-29  Lute Kamstra  <Lute.Kamstra@cwi.nl>
 
        * modes.texi (Mode Line Data): Explain when symbols in mode-line

diff --git a/src/ChangeLog b/src/ChangeLog
index 0c23509..34307c3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2003-09-30  Richard M. Stallman  <rms@gnu.org>
+
+       * term.c (set_tty_color_mode): Calculate current_mode_spec
+       regardless of value of VAL.
+
+       * intervals.c (graft_intervals_into_buffer): 
+       Set BUF_INTERVALS (buffer)->up_obj when appropriate.
+       Handle over_used when splitting UNDER.
+
+2003-09-30  YAMAMOTO  Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
+
+       * regex.c (regex_compile): Free the stack when returning from function.
+
 2003-09-28  Kenichi Handa  <handa@m17n.org>
 
        * fontset.c (Finternal_char_font): Change return value to