Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-673
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-674
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-675
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-676
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-677
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-678
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-679
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-680
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-681
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-682
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-683
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-684
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-685
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-686
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-687
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-688
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-689
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-690
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-691
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-692
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-693
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-69
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-70
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-71
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-267

1 files changed, 10 insertions, 11 deletions

diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index 85dfaeaf35f..f89cb7b0d47 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -23104,8 +23104,8 @@
         * message.el (message-mode): Delete abbrev mode initialization.
         (message-mode-hook): Move it here, instead, so the user can
         override it.
-        (message-y-or-n-p, message-talkative-question,
-        message-flatten-list, message-flatten-list-1): Move utility
+        (message-y-or-n-p, message-talkative-question)
+        (message-flatten-list, message-flatten-list-1): Move utility
         functions up so macro is defined before first invocation.
 
         * f90.el (f90-auto-fill-mode): Function deleted, all references
@@ -23115,24 +23115,23 @@
 
 1996-08-13  Torbjorn Einarsson  <etxeina@etxdn.ericsson.se>
 
-        * f90.el: (f90-do-auto-fill): Fixed bug which made program hang for
+        * f90.el: (f90-do-auto-fill): Fix bug which made program hang for
         space in fill-column.
         (f90-font-lock-keywords-1): Now we have common font-lock
         exps for Emacs and XEmacs
-        (f90-font-lock-keywords-2): Changed reg-exp for line number.  A
-        number must be followed by a letter to be highlighted.  Fixed
-        highlighting of declarations with trailing comments.
-        (f90-match-end): Fixed bug due to new message syntax.
-        (f90-mode): Fixed setup of variable font-lock-defaults.
+        (f90-font-lock-keywords-2): Change reg-exp for line number.
+        A number must be followed by a letter to be highlighted.
+        Fix highlighting of declarations with trailing comments.
+        (f90-match-end): Fix bug due to new message syntax.
+        (f90-mode): Fix setup of variable font-lock-defaults.
         (f90-looking-at-program-block-start): Small error in detecting of
         function start. Made the detection of subroutine start more flexible.
         (f90-mode-map): Much nicer menu with sections and added submenus
         for highlighting and keyword case change.
         Also added 'menu-enable' properties for region-based commands.
-        (f90-imenu-generic-expression): Fixed expression to find
+        (f90-imenu-generic-expression): Fix expression to find
         procedures, modules and types.
-        (f90-add-imenu-menu): New function for adding imenu menu to the
-        menubar.
+        (f90-add-imenu-menu): New function for adding imenu menu to the menubar.
 
 1996-08-13  Richard Stallman  <rms@psilocin.gnu.ai.mit.edu>