ChangeLog fixes

24 files changed, 424 insertions, 423 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 29ed8fadd29..cc5518b4fce 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -5117,10 +5117,6 @@
 
         * maintaining.texi (Tags): Fix last change.
 
-2008-02-02  Michael Albinus  <michael.albinus@gmx.de>
-
-        * tramp.texi: Use new FSF's Back-Cover Text.
-
 2008-01-31  Nick Roberts  <nickrob@snap.net.nz>
 
         * trouble.texi (Checklist): Direct users to emacs-devel@gnu.org.
@@ -5163,8 +5159,6 @@
         * search.texi (Query Replace): Make exp of query-replace more
         self-contained, and clarify.
 
-        * cc-mode.texi (Getting Started): Change @ref to @pxref.
-
 2007-12-15  Richard Stallman  <rms@gnu.org>
 
         * files.texi (Auto Save): Clarify definition of auto-saving.
@@ -5716,6 +5710,11 @@
         * frames.texi (Secondary Selection): Window clicked does not matter
         when mouse-yank-at-point is non-nil.
 
+2007-01-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdog.texi (ls in Lisp): Document ls-lisp-format-time-list and
+        ls-lisp-use-localized-time-format.
+
 2007-01-16  Glenn Morris  <rgm@gnu.org>
 
         * abbrevs.texi (Editing Abbrevs): Describe how to disable a
@@ -6043,6 +6042,11 @@
         Change "Library Public License" to "Lesser Public License"
         throughout.  Use "yyyy" to represent year.
 
+2006-09-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * misc.texi (Interactive Shell): EMACS is now set
+        to Emacs's absolute file name, not to "t".
+
 2006-09-12  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * files.texi (Visiting): Add index entry "open file".
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 38427e56b9b..4044e965ae7 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -9395,7 +9395,7 @@
 
         * variables.texi (Variable Aliases): Simplify.
 
-        * anti.texi, backups.texi, compile.texi, customization.texi:
+        * anti.texi, backups.texi, compile.texi, customize.texi:
         * debugging.texi, display.texi, edebug.texi, errors.texi, frames.texi:
         * functions.texi, help.texi, keymaps.texi, modes.texi, nonascii.texi:
         * os.texi, processes.texi, searching.texi, strings.texi, text.texi:
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 65a2da7d542..722d11c70f2 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -664,7 +664,7 @@
 
 2013-10-17  Jay Belanger  <jay.p.belanger@gmail.com>
 
-        * calc.el (Data Type Formats): Don't specify the size at
+        * calc.texi (Data Type Formats): Don't specify the size at
         which integers begin to be represented by lists.
 
 2013-10-14  Xue Fuqiao  <xfq.free@gmail.com>
@@ -6293,6 +6293,12 @@
 
         * org.texi: Massive changes, in many parts of the file.
 
+2008-04-27  Jason Riedy  <jason@acm.org>
+
+        * org.texi (A LaTeX example): Note that fmt may be a
+        one-argument function, and efmt may be a two-argument function.
+        (Radio tables): Document multiple destinations.
+
 2008-04-13  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * gnus.texi (Oort Gnus): Add message-fill-column.
@@ -6525,6 +6531,10 @@
 
         * tramp.texi (Remote processes): Add `shell-command'.
 
+2008-02-02  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi: Use new FSF's Back-Cover Text.
+
 2008-01-28  Michael Sperber  <sperber@deinprogramm.de>
 
         * gnus.texi (Mail Source Specifiers): Document `group' specifier.
@@ -6625,7 +6635,7 @@
 
 2007-12-29  Jay Belanger  <jay.p.belanger@gmail.com>
 
-        * calc.tex (Yacas Language, Maxima Language, Giac Language):
+        * calc.texi (Yacas Language, Maxima Language, Giac Language):
         New sections.
 
 2007-12-29  Reiner Steib  <Reiner.Steib@gmx.de>
@@ -6643,6 +6653,10 @@
 
         * trampver.texi: Update release number.
 
+2007-12-22  Richard Stallman  <rms@gnu.org>
+
+        * cc-mode.texi (Getting Started): Change @ref to @pxref.
+
 2007-12-22  Michael Albinus  <michael.albinus@gmx.de>
 
         * dbus.texi (Type Conversion): Correct input parameters mapping.
@@ -7904,11 +7918,6 @@
         * gnus.texi (Batching Agents): Fix example.  Reported by Tassilo Horn
         <tassilo@member.fsf.org>.
 
-2007-01-27  Eli Zaretskii  <eliz@gnu.org>
-
-        * msdog.texi (ls in Lisp): Document ls-lisp-format-time-list and
-        ls-lisp-use-localized-time-format.
-
 2007-01-20  Markus Triska  <markus.triska@gmx.at>
 
         * flymake.texi (Flymake mode): find-file-hook instead of ...-hooks.
@@ -8204,7 +8213,6 @@
         * faq.texi (Escape sequences in shell output): EMACS is now set
         to Emacs's absolute file name, not to "t".
         (^M in the shell buffer): Likewise.
-        * misc.texi (Interactive Shell): Likewise.
 
 2006-09-11  Reiner Steib  <Reiner.Steib@gmx.de>
 
@@ -8222,6 +8230,10 @@
 
         * smtpmail.texi (Authentication): Mention SSL.
 
+2006-09-03  Diane Murray  <disumu@x3y2z1.net>
+
+        * erc.texi (Getting Started, Connecting): Change erc-select to erc.
+
 2006-09-01  Eli Zaretskii  <eliz@gnu.org>
 
         * rcirc.texi (Internet Relay Chat, Useful IRC commands):
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 24bd6cede5e..068447b25b1 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -2587,7 +2587,7 @@
         * refcards/calccard.ps, refcards/cs-dired-ref.ps:
         * refcards/cs-refcard.ps, refcards/de-refcard.ps, refcards/dired-ref.ps:
         * refcards/fr-drdref.ps, refcards/fr-refcard.ps:
-        * refcards/gnus-booklet.ps, refcards/gnus-logo.ps:
+        * refcards/gnus-booklet.ps, refcards/gnus-logo.eps:
         * refcards/gnus-refcard.ps, refcards/orgcard.ps, refcards/pl-refcard.ps:
         * refcards/pt-br-refcard.ps, refcards/refcard.ps:
         * refcards/ru-refcard.ps, refcards/sk-dired-ref.ps:
@@ -3127,7 +3127,7 @@
 
 2007-01-20  Glenn Morris  <rgm@gnu.org>
 
-        * cd-dired-ref.tex (versionemacs): New def.
+        * cs-dired-ref.tex (versionemacs): New def.
         * cs-refcard.tex (versionemacs, versionyear): New defs.
         * cs-survival.tex (versionemacs, versiondate): New defs.
         * de-refcard.tex (versionemacs, versionyear): New defs.
@@ -3306,10 +3306,6 @@
         * PROBLEMS (are): Emacs compiled with Gtk+ crashes when closing a
         display (x-close-connection).
 
-2006-09-03  Diane Murray  <disumu@x3y2z1.net>
-
-        * erc.texi (Getting Started, Connecting): Change erc-select to erc.
-
 2006-09-02  Juri Linkov  <juri@jurta.org>
 
         * HELLO: Regroup Europe Non-ASCII examples by similar scripts.
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 1a13c1b66d3..5a10d1c46e4 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -770,10 +770,10 @@
 
 2008-02-01  Dave Love  <fx@gnu.org>
 
-        * latin-post.el: Recode to utf-8.
+        * quail/latin-post.el: Recode to utf-8.
         ("latin-postfix"): New method.
 
-        * latin-alt.el: Recode to utf-8.
+        * quail/latin-alt.el: Recode to utf-8.
         ("latin-alt-postfix"): New method.
 
         * quail/latin-pre.el: Recode to utf-8.
@@ -2167,11 +2167,11 @@
         * Makefile.in: Prepend ${srcdir} to all non-TIT lisp file names.
         (leim-list.el): Depend on ${WORLD}.
 
-        * latin-alt.el (latin-2-alt-postfix): Doc fix.
+        * quail/latin-alt.el (latin-2-alt-postfix): Doc fix.
 
 1998-04-08  Karl Heuer  <kwzh@mescaline.gnu.org>
 
-        * czech.el, slovak.el: Correct starting commentary.
+        * quail/czech.el, quail/slovak.el: Correct starting commentary.
 
 1998-04-07  Milan Zamazal  <pdm@fi.muni.cz>
 
@@ -2179,7 +2179,7 @@
 
 1998-04-06  Andreas Schwab  <schwab@gnu.org>
 
-        * lrt.el (lrt-composing-pattern-double-c): Change chars-in-string
+        * quail/lrt.el (lrt-composing-pattern-double-c): Change chars-in-string
         to length.
         (lrt-generate-quail-map): Change sref to aref, and make second
         argument of substring a character index.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 50efe9c45c2..f59908ef353 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -69,7 +69,7 @@
         * version.el (emacs-bzr-version): Name changed to
         emacs-repository-version. Obsolete-variable alias made.
         * loadup.el: Follow through on this name change.
-        * lisp/mail/emacsbug.el (report-emacs-bug): Factor out any
+        * mail/emacsbug.el (report-emacs-bug): Factor out any
         assumption about the version control system in use.
 
 2014-01-08  David Engster  <deng@randomsample.de>
@@ -3421,7 +3421,7 @@
 
 2013-10-17  Barry O'Reilly  <gundaetiapo@gmail.com>
 
-        * lisp/subr.el (sit-for): Call (input-pending-p t) so as to behave
+        * subr.el (sit-for): Call (input-pending-p t) so as to behave
         as before.
 
 2013-10-18  Reuben Thomas  <rrt@sc3d.org>
@@ -4194,13 +4194,13 @@
 
 2013-09-28  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
-        * lisp/progmodes/octave.el (octave-mode-map): Bind octave-send-buffer.
+        * progmodes/octave.el (octave-mode-map): Bind octave-send-buffer.
         (octave-mode-menu): Add octave-send-buffer.
         (octave-send-buffer): New function.
 
 2013-09-28  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
-        * lisp/progmodes/octave.el (octave-mode-map): Add key binding for
+        * progmodes/octave.el (octave-mode-map): Add key binding for
         octave-lookfor.
         (octave-mode-menu): Add octave-lookfor.
         (inferior-octave-mode-map, octave-help-mode-map): Bind C-ha to
@@ -6202,7 +6202,7 @@
         * isearch.el (isearch-done):
         * jit-lock.el (jit-lock-stealth-fontify):
         * mail/rmailsum.el (rmail-summary-scroll-msg-up):
-        * lisp/mouse-drag.el (mouse-drag-should-do-col-scrolling):
+        * mouse-drag.el (mouse-drag-should-do-col-scrolling):
         * mpc.el (mpc-tagbrowser, mpc):
         * net/rcirc.el (rcirc-any-buffer):
         * play/gomoku.el (gomoku-max-width, gomoku-max-height):
@@ -7573,12 +7573,12 @@
 
         * files.el (find-file-noselect): Simplify conditional expression.
 
-        * remember.el (remember-append-to-file):
+        * textmodes/remember.el (remember-append-to-file):
         Don't mix `find-buffer-visiting' and `get-file-buffer'.
 
         Add `remember-notes' function to store random notes across Emacs
         restarts.
-        * remember.el (remember-data-file): Add :set callback to affect
+        * textmodes/remember.el (remember-data-file): Add :set callback to affect
         notes buffer (if any).
         (remember-notes): New command.
         (remember-notes-buffer-name, bury-remember-notes-on-kill):
@@ -9156,7 +9156,7 @@
 
 2013-06-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * lisp/subr.el: Convert to lexical binding.
+        * subr.el: Convert to lexical binding.
         (overriding-local-map): Make obsolete.
         (add-to-list): Doc fix.  Add compiler macro.
         (read-key): Swap values of local maps.
@@ -9811,16 +9811,16 @@
 
 2013-05-23  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
-        * lisp/textmodes/reftex.el (reftex-ref-style-toggle):
+        * textmodes/reftex.el (reftex-ref-style-toggle):
         Fix deactivate action.
 
-        * lisp/textmodes/reftex-vars.el (reftex-ref-style-alist):
+        * textmodes/reftex-vars.el (reftex-ref-style-alist):
         Add cleveref macros.
 
-        * lisp/textmodes/reftex-parse.el
+        * textmodes/reftex-parse.el
         (reftex-locate-bibliography-files): Accept options for
         bibliography commands.
-        * lisp/textmodes/reftex-vars.el (reftex-bibliography-commands):
+        * textmodes/reftex-vars.el (reftex-bibliography-commands):
         Add addbibresource.  Basic Biblatex support.
 
 2013-05-23  Michael Albinus  <michael.albinus@gmx.de>
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index ab6923bfd1c..b70ca7734e7 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -67,8 +67,8 @@
         * progmodes/cc-awk.el: New file that implements AWK support,
         superseding the old separate derived mode in awk-mode.el.
 
-        * progmodes/cc-vars.el, cc-mode-19.el, progmodes/cc-langs.el,
-        * progmodes/cc-mode.el, progmodes/cc-defs.el,
+        * progmodes/cc-vars.el, progmodes/cc-mode-19.el, progmodes/cc-langs.el:
+        * progmodes/cc-mode.el, progmodes/cc-defs.el:
         * progmodes/cc-engine.el, progmodes/cc-fonts.el:
         Changes for the new AWK support.
 
@@ -4486,7 +4486,7 @@
 
 2003-03-26  Steve Youngs  <youngs@xemacs.org>
 
-        * em-unix.el (eshell-plain-locate-behavior): Make the default
+        * eshell/em-unix.el (eshell-plain-locate-behavior): Make the default
         nil on Emacs, t on XEmacs.
 
 2003-03-25  Stefan Monnier  <monnier@cs.yale.edu>
@@ -6354,11 +6354,11 @@
         * mh-e: Created directory.  ChangeLog will appear in a week when we
         release version 7.2.
 
-        * mail/mh-alias.el, mail/mh-comp.el, mail/mh-customize.el, mail/mh-e.el,
-        mail/mh-funcs.el, mail/mh-identity.el, mail/mh-index.el,
-        mail/mh-loaddefs.el, mail/mh-mime.el, mail/mh-pick.el,
-        mail/mh-seq.el, mail/mh-speed.el, mail/mh-utils.el,
-        mail/mh-xemacs-compat.el: Moved to mh-e directory.
+        * mail/mh-alias.el, mail/mh-comp.el, mail/mh-customize.el, mail/mh-e.el:
+        * mail/mh-funcs.el, mail/mh-identity.el, mail/mh-index.el:
+        * mail/mh-loaddefs.el, mail/mh-mime.el, mail/mh-pick.el:
+        * mail/mh-seq.el, mail/mh-speed.el, mail/mh-utils.el:
+        * mail/mh-xemacs-compat.el: Move to mh-e directory.
         Note that reply2.pbm and reply2.xpm, which were created by the
         MH-E package, were left in mail since they can probably be used by
         other mail packages.
@@ -10676,7 +10676,7 @@
 
 2002-09-18  Michael Kifer  <kifer@cs.stonybrook.edu>
 
-        * ediff-hooks.el: Put back the autoloads (for XEmacs compatibility).
+        * ediff-hook.el: Put back the autoloads (for XEmacs compatibility).
 
         * ediff-init.el: Use defalias instead of fset.
 
@@ -11693,32 +11693,32 @@
 
 2002-08-27  Carsten Dominik  <dominik@sand.science.uva.nl>
 
-        * textfile/reftex-ref.el (reftex-goto-label): New command.
+        * textmodes/reftex-ref.el (reftex-goto-label): New command.
 
-        * textfile/reftex-vars.el (reftex-part-resets-chapter): New option.
+        * textmodes/reftex-vars.el (reftex-part-resets-chapter): New option.
 
-        * textfile/reftex-parse.el (reftex-roman-number): New function.
+        * textmodes/reftex-parse.el (reftex-roman-number): New function.
         (reftex-section-number): Better handling of parts: No chapter
         counter resets.
 
-        * textfile/reftex.el (reftex-highlight-overlays): Added a third
+        * textmodes/reftex.el (reftex-highlight-overlays): Added a third
         overlay.
         (reftex-mode-menu): Added entry for `reftex-toc-recenter.
         Also moved `reftex-reset-mode' to top level.
 
-        * textfile/reftex-toc.el (reftex-toc-recenter): New command.
+        * textmodes/reftex-toc.el (reftex-toc-recenter): New command.
         (reftex-toc-pre-command-hook): Don't remove highlight overlay.
         (reftex-toc-post-command-hook): Use overlay no 2 for highlighting.
 
-        * textfile/reftex-sel.el (reftex-get-offset): Get offset of
+        * textmodes/reftex-sel.el (reftex-get-offset): Get offset of
         document pointer *before* position, not after.
         (reftex-insert-docstruct): Get offset of document pointer *before*
         position, not after.
 
-        * textfiles/reftex-parse.el (reftex-where-am-I): Prefer marker
+        * textmodes/reftex-parse.el (reftex-where-am-I): Prefer marker
         match over section title match.
 
-        * textfiles/reftex-cite.el (reftex-bib-or-thebib): New function
+        * textmodes/reftex-cite.el (reftex-bib-or-thebib): New function
         which determines on a per-file-basis if BibTeX is being used
         locally for citations.
         (reftex-offer-bib-menu): Use `reftex-bib-or-thebib' for better
@@ -11726,7 +11726,7 @@
         (reftex-bibtex-selection-callback): Use `reftex-bib-or-thebib' for
         better cooperation with chapterbib.
 
-        * textfiles/reftex-dcr.el (reftex-view-cr-cite):
+        * textmodes/reftex-dcr.el (reftex-view-cr-cite):
         Use `reftex-bib-or-thebib' for better cooperation with chapterbib.
 
 2002-08-26  Kim F. Storm  <storm@cua.dk>
@@ -11891,7 +11891,7 @@
 
 2002-08-20  Carsten Dominik  <dominik@astro.uva.nl>
 
-        * textfiles/reftex-cite.el (reftex-bib-or-thebib): New function
+        * textmodes/reftex-cite.el (reftex-bib-or-thebib): New function
         which determines on a per-file-basis if BibTeX is being used
         locally for citations.
         (reftex-offer-bib-menu): Use `reftex-bib-or-thebib' for better
@@ -11899,7 +11899,7 @@
         (reftex-bibtex-selection-callback): Use `reftex-bib-or-thebib' for
         better cooperation with chapterbib.
 
-        * textfiles/reftex-dcr.el (reftex-view-cr-cite):
+        * textmodes/reftex-dcr.el (reftex-view-cr-cite):
         Use `reftex-bib-or-thebib' for better cooperation with chapterbib.
 
 2002-08-20  Kim F. Storm  <storm@cua.dk>
@@ -11909,7 +11909,7 @@
         with keyboard macro related commands.  The original binding on
         C-x C-k is moved to C-x C-k e.
 
-        * binding.el: Remove macro related bindings (now in kmacro.el).
+        * bindings.el: Remove macro related bindings (now in kmacro.el).
 
         * edmacro.el: Remove C-x C-k binding (now in kmacro.el).
 
@@ -12099,12 +12099,12 @@
 
 2002-04-09  John Wiegley  <johnw@gnu.org>
 
-        * esh-util.el: Removed eshell-under-cygwin-p, and all uses of it.
-        * em-cmpl.el (eshell-cmpl-ignore-case): Ditto.
-        * em-dirs.el (eshell/cd): Ditto.
-        * em-glob.el (eshell-glob-case-insensitive): Ditto.
-        * em-hist.el (eshell-previous-matching-input-string-position): Ditto.
-        * esh-ext.el (eshell-binary-suffixes): Ditto.
+        * eshell/em-cmpl.el (eshell-cmpl-ignore-case):
+        * eshell/em-dirs.el (eshell/cd):
+        * eshell/em-glob.el (eshell-glob-case-insensitive):
+        * eshell/em-hist.el (eshell-previous-matching-input-string-position):
+        * eshell/esh-ext.el (eshell-binary-suffixes):
+        * eshell/esh-util.el: Remove eshell-under-cygwin-p, and all uses of it.
 
 2002-08-09  Richard M. Stallman  <rms@gnu.org>
 
@@ -12197,12 +12197,12 @@
 
 2002-04-09  John Paul Wallington  <jpw@shootybangbang.com>
 
-        * esh-util.el (eshell-under-cygwin-p): New function.
-        * em-cmpl.el (eshell-cmpl-ignore-case): Use it.
-        * em-dirs.el (eshell/cd): Ditto.
-        * em-glob.el (eshell-glob-case-insensitive): Ditto.
-        * em-hist.el (eshell-previous-matching-input-string-position): Ditto.
-        * esh-ext.el (eshell-binary-suffixes): Ditto.
+        * eshell/esh-util.el (eshell-under-cygwin-p): New function.
+        * eshell/em-cmpl.el (eshell-cmpl-ignore-case):
+        * eshell/em-dirs.el (eshell/cd):
+        * eshell/em-glob.el (eshell-glob-case-insensitive):
+        * eshell/em-hist.el (eshell-previous-matching-input-string-position):
+        * eshell/esh-ext.el (eshell-binary-suffixes): Use it.
 
 2002-08-05  Richard M. Stallman  <rms@gnu.org>
 
@@ -14192,7 +14192,7 @@
 
 2002-06-09  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-style.el (c-set-style, c-set-style-1):
+        * progmodes/cc-styles.el (c-set-style, c-set-style-1):
         Add another state for the `dont-override' flag where it only keeps
         globally set variables.
 
@@ -15640,7 +15640,7 @@
 
 2002-04-25  Michael Kifer  <kifer@cs.stonybrook.edu>
 
-        * ediff-hooks.el: Put back the autoloads.
+        * ediff-hook.el: Put back the autoloads.
 
 2002-04-25  Colin Walters  <walters@verbum.org>
 
@@ -16457,8 +16457,8 @@
 
 2002-04-22  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-align.el, progmodes/cc-defs.el,
-        progmodes/cc-cmds.el, progmodes/cc-engine.el, cc-vars.el:
+        * progmodes/cc-align.el, progmodes/cc-defs.el:
+        * progmodes/cc-cmds.el, progmodes/cc-engine.el, progmodes/cc-vars.el:
         Several fixes to treat macros as code and not literals and to
         handle line continuations transparently.
 
@@ -17484,7 +17484,7 @@
 
 2002-04-01  Ville Skyttä  <ville.skytta@xemacs.org>
 
-        * tcl.el (tcl-imenu-generic-expression): New value.
+        * progmodes/tcl.el (tcl-imenu-generic-expression): New value.
         (tcl-imenu-create-index-function): Function deleted.
         (tcl-mode): Check for filladapt-mode.
         Use tcl-imenu-generic-expression instead of
@@ -22092,25 +22092,29 @@
         (calc-do-keypad): Use it.
         (calc-keypad-map): Move into `calc-keypad-mode'.
 
-        * calc-math.el (calcFunc-sqrt, calcFunc-hypot): Add missing quote
+        * calc/calc-math.el (calcFunc-sqrt, calcFunc-hypot): Add missing quote
         to defalias argument.
 
-        * calc-misc.el (math-fixnump, math-fixnatnump, calcFunc-trunc)
+        * calc/calc-misc.el (math-fixnump, math-fixnatnump, calcFunc-trunc)
         (calcFunc-floor): Ditto.
 
-        * calc-units.el (calcFunc-usimplify): Ditto.
-
-        * calc-aent.el, calc-ext.el, calc-incom.el, calc-misc.el
-        * calc-sel.el, calc-vec.el, calc-alg.el, calc-fin.el
-        * calc-keypd.el, calc-mode.el, calc-stat.el, calc-yank.el
-        * calc-arith.el, calc-forms.el, calc-lang.el, calc-mtx.el
-        * calc-store.el, calc.el, calc-bin.el, calc-frac.el, calc-macs.el
-        * calc-poly.el, calc-stuff.el, calcalg2.el, calc-comb.el
-        * calc-funcs.el, calc-maint.el, calc-prog.el, calc-trail.el
-        * calcalg3.el, calc-cplx.el, calc-graph.el, calc-map.el
-        * calc-rewr.el, calc-undo.el, calccomp.el, calc-embed.el
-        * calc-help.el, calc-math.el, calc-rules.el, calc-units.el
-        * calcsel2.el: Change all toplevel `setq' forms to `defvar' forms,
+        * calc/calc-units.el (calcFunc-usimplify): Ditto.
+
+        * calc/calc-aent.el, calc/calc-ext.el, calc/calc-incom.el:
+        * calc/calc-misc.el, calc/calc-sel.el, calc/calc-vec.el:
+        * calc/calc-alg.el, calc/calc-fin.el, calc/calc-keypd.el:
+        * calc/calc-mode.el, calc/calc-stat.el, calc/calc-yank.el:
+        * calc/calc-arith.el, calc/calc-forms.el, calc/calc-lang.el:
+        * calc/calc-mtx.el, calc/calc-store.el, calc/calc.el:
+        * calc/calc-bin.el, calc/calc-frac.el, calc/calc-macs.el:
+        * calc/calc-poly.el, calc/calc-stuff.el, calc/calcalg2.el:
+        * calc/calc-comb.el, calc/calc-funcs.el, calc/calc-maint.el:
+        * calc/calc-prog.el, calc/calc-trail.el, calc/calcalg3.el:
+        * calc/calc-cplx.el, calc/calc-graph.el, calc/calc-map.el:
+        * calc/calc-rewr.el, calc/calc-undo.el, calc/calccomp.el:
+        * calc/calc-embed.el, calc/calc-help.el, calc/calc-math.el:
+        * calc/calc-rules.el, calc/calc-units.el, calc/calcsel2.el:
+        Change all toplevel `setq' forms to `defvar' forms,
         and move them before their first use.  Use `when', `unless'.
         Remove trailing periods from error forms.  Add description and
         headers suggested by Emacs Lisp coding conventions.
@@ -22360,21 +22364,24 @@
 
         * calc/calc-units.el (calcFunc-unsimplify): Ditto.
 
-        * calc-aent.el, calc-ext.el, calc-incom.el, calc-misc.el
-        * calc-sel.el, calc-vec.el, calc-alg.el, calc-fin.el
-        * calc-keypd.el, calc-mode.el, calc-stat.el, calc-yank.el
-        * calc-arith.el, calc-forms.el, calc-lang.el, calc-mtx.el
-        * calc-store.el, calc.el, calc-bin.el, calc-frac.el, calc-macs.el
-        * calc-poly.el, calc-stuff.el, calcalg2.el, calc-comb.el
-        * calc-funcs.el, calc-maint.el, calc-prog.el, calc-trail.el
-        * calcalg3.el, calc-cplx.el, calc-graph.el, calc-map.el
-        * calc-rewr.el, calc-undo.el, calccomp.el, calc-embed.el
-        * calc-help.el, calc-math.el, calc-rules.el, calc-units.el
-        * calcsel2.el: Style cleanup; don't put closing parens on their
-        own line, add "foo.el ends here" to each file, and update
-        copyright date.
-
-        * README: Update maintainer.
+        * calc/calc-aent.el, calc/calc-ext.el, calc/calc-incom.el:
+        * calc/calc-misc.el, calc/calc-sel.el, calc/calc-vec.el:
+        * calc/calc-alg.el, calc/calc-fin.el, calc/calc-keypd.el:
+        * calc/calc-mode.el, calc/calc-stat.el, calc/calc-yank.el:
+        * calc/calc-arith.el, calc/calc-forms.el, calc/calc-lang.el:
+        * calc/calc-mtx.el, calc/calc-store.el, calc/calc.el, calc/calc-bin.el:
+        * calc/calc-frac.el, calc/calc-macs.el, calc/calc-poly.el:
+        * calc/calc-stuff.el, calc/calcalg2.el, calc/calc-comb.el:
+        * calc/calc-funcs.el, calc/calc-maint.el, calc/calc-prog.el:
+        * calc/calc-trail.el, calcalg3.el, calc/calc-cplx.el:
+        * calc/calc-graph.el, calc/calc-map.el, calc/calc-rewr.el:
+        * calc/calc-undo.el, calc/calccomp.el, calc/calc-embed.el:
+        * calc/calc-help.el, calc/calc-math.el, calc/calc-rules.el:
+        * calc/calc-units.el, calc/calcsel2.el: Style cleanup;
+        don't put closing parens on their own line,
+        add "foo.el ends here" to each file, and update copyright date.
+
+        * calc/README: Update maintainer.
 
 2001-11-13  Richard M. Stallman  <rms@gnu.org>
 
diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11
index 2917f17da88..e41f3a81286 100644
--- a/lisp/ChangeLog.11
+++ b/lisp/ChangeLog.11
@@ -1293,9 +1293,9 @@
 
 2004-11-26  Jay Belanger  <belanger@truman.edu>
 
-        * calc-misc.el (calc-last-why-command): Declare it.
+        * calc/calc-misc.el (calc-last-why-command): Declare it.
 
-        * calc-vec.el (math-grade-vec): New variable.
+        * calc/calc-vec.el (math-grade-vec): New variable.
         (calcFunc-grade, calcFunc-rgrade, math-grade-beforep):
         Replace variable grade-vec by declared variable.
         (math-rb-close): New variable.
@@ -1424,7 +1424,8 @@
 
 2004-11-26  Lars Hansen  <larsh@math.ku.dk>
 
-        * tramp.el (tramp-handle-directory-files-and-attributes): New function.
+        * net/tramp.el (tramp-handle-directory-files-and-attributes):
+        New function.
         (tramp-perl-directory-files-and-attributes): New constant.
         (tramp-file-name-handler-alist): Delete file-directory-files, add
         directory-files-and-attributes.
@@ -11950,7 +11951,7 @@
 
 2003-11-16  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-engine.el (c-guess-continued-construct)
+        * progmodes/cc-engine.el (c-guess-continued-construct)
         (c-guess-basic-syntax): Check a little more carefully if it's a
         function declaration when an unknown construct followed by a block
         is found inside a statement context.  This avoids macros followed
@@ -11964,7 +11965,8 @@
         start is in a position so that `c-beginning-of-statement-1' jumped
         to the beginning of the same statement.
 
-        * cc-fonts.el, cc-engine.el (c-forward-<>-arglist-recur):
+        * progmodes/cc-fonts.el, progmodes/cc-engine.el
+        (c-forward-<>-arglist-recur):
         Don't accept binary operators in the arglist if we're in a function
         call context, i.e. if `c-restricted-<>-arglists' is set.  That avoids
         template recognition in cases like "if (a < b || c > d)".
@@ -11974,38 +11976,39 @@
 
         Accessing functions updated for the variable name change.
 
-        * cc-engine.el (c-syntactic-re-search-forward): Fix bug where the
-        match data could get clobbered if NOT-INSIDE-TOKEN is used.
+        * progmodes/cc-engine.el (c-syntactic-re-search-forward): Fix bug
+        where the match data could get clobbered if NOT-INSIDE-TOKEN is used.
 
-        * cc-engine.el (c-beginning-of-statement-1): Don't allow parens in
-        labels.
+        * progmodes/cc-engine.el (c-beginning-of-statement-1):
+        Don't allow parens in labels.
 
         (c-backward-to-decl-anchor): Use `c-beginning-of-statement-1'
         instead of duplicating parts of it.  This fixes bogus label
         recognition.
 
-        * cc-align.el (c-gnu-impose-minimum): Revert to the old method
+        * progmodes/cc-align.el (c-gnu-impose-minimum): Revert to the old method
         of checking the context in which to apply the minimum indentation,
         so that it isn't enforced in e.g. namespace blocks.
 
-        * cc-vars.el (c-inside-block-syms): New constant used by
+        * progmodes/cc-vars.el (c-inside-block-syms): New constant used by
         `c-gnu-impose-minimum'.  It's defined close to `c-offsets-alist'
         to somewhat reduce the risk of becoming stale.
 
-        * cc-cmds.el, cc-engine.el (c-shift-line-indentation): Move from
-        cc-cmds to cc-engine to allow use from cc-align.
+        * progmodes/cc-cmds.el, progmodes/cc-engine.el
+        (c-shift-line-indentation): Move from cc-cmds to cc-engine
+        to allow use from cc-align.
 
-        * cc-engine.el (c-beginning-of-inheritance-list): Cope with fully
-        qualified identifiers containing "::".
+        * progmodes/cc-engine.el (c-beginning-of-inheritance-list):
+        Cope with fully qualified identifiers containing "::".
 
-        * cc-defs.el (c-make-keywords-re): Add kludge for bug in
+        * progmodes/cc-defs.el (c-make-keywords-re): Add kludge for bug in
         `regexp-opt' in Emacs 20 and XEmacs when strings contain newlines.
 
-        * cc-vars.el (c-emacs-features): Use a space in front of the name
-        of the temporary buffer.  That also avoids dumping problems in
+        * progmodes/cc-vars.el (c-emacs-features): Use a space in front of
+        the name of the temporary buffer.  That also avoids dumping problems in
         XEmacs due to undo info being left around after the buffer is killed.
 
-        * cc-engine.el (c-in-knr-argdecl): Look closer at the function
+        * progmodes/cc-engine.el (c-in-knr-argdecl): Look closer at the function
         arglist to see if it's a K&R style declaration.
 
         (c-guess-basic-syntax): CASE 5B.2: Check with `c-in-knr-argdecl'
@@ -13476,20 +13479,20 @@
 
 2003-08-11  Carsten Dominik  <dominik@sand.science.uva.nl>
 
-        * reftex-toc.el (reftex-toc-rename-label): New function.
+        * textmodes/reftex-toc.el (reftex-toc-rename-label): New function.
         (reftex-toc-check-docstruct): New function.
 
-        * reftex.el (reftex-region-active-p): New function.
+        * textmodes/reftex.el (reftex-region-active-p): New function.
 
-        * reftex-parse.el (reftex-locate-bibliography-files): Improved the
+        * textmodes/reftex-parse.el (reftex-locate-bibliography-files): Improved the
         regexp to find the \bibliography macro.
 
-        * reftex-vars.el (reftex-section-levels): Removed subsubparagraph,
+        * textmodes/reftex-vars.el (reftex-section-levels): Removed subsubparagraph,
         which does not exist in LaTeX.
         (reftex-cite-format-builtin): Added amsrefs support.
         (reftex-toc-confirm-promotion): New option
 
-        * reftex-toc.el
+        * textmodes/reftex-toc.el
         (reftex-toc): Use `reftex-toc-split-windows-fraction'.
         (reftex-toc-demote, reftex-toc-promote)
         (reftex-toc-do-promote, reftex-toc-promote-prepare)
@@ -13512,10 +13515,9 @@
         (reftex-toc-quit): Adapted to delete frame when called in
         dedicated frame.
 
-        * reftex-index.el (reftex-index-phrase-match-is-indexed): Check
+        * textmodes/reftex-index.el (reftex-index-phrase-match-is-indexed): Check
         all enclosing macros.
 
-
 2003-08-08  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
         * progmodes/ebnf2ps.el (ebnf-total, ebnf-nprod): Move defvar before
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index 70eefd02a72..72a22723ed7 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -8191,8 +8191,9 @@
 
 2006-07-10  Alan Mackenzie  <acm@muc.de>
 
-        * progmodes/cc-awk.el, cc-defs.el, cc-fonts.el, cc-langs.el:
-        * cc-mode.el: Changes to eradicate eval-after-load.
+        * progmodes/cc-awk.el, progmodes/cc-defs.el, progmodes/cc-fonts.el:
+        * progmodes/cc-langs.el, progmodes/cc-mode.el:
+        Changes to eradicate eval-after-load.
 
 2006-07-09  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -12229,7 +12230,7 @@
 
 2006-02-24  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-cmds.el, cc-mode.el: Rename c-hungry-backspace to
+        * progmodes/cc-cmds.el, progmodes/cc-mode.el: Rename c-hungry-backspace to
         c-hungry-delete-backwards, at the request of RMS.  Leave the old
         name as an alias.
 
@@ -12283,7 +12284,7 @@
 
         * progmodes/cc-defs.el (c-version): Update version number to 5.31.2.
 
-        * progmodes/cc-cmds.el, cc-mode.el, cc-engine.el
+        * progmodes/cc-cmds.el, progmodes/cc-mode.el, progmodes/cc-engine.el
         (c-update-modeline): Concatenate the minor mode indicators
         directly onto mode-name, removing c-submode-indicators.
         Sometimes, c-s-i got separated from the mode name on the mode line.
@@ -15730,7 +15731,8 @@
         Emacsen which lack `define-minor-mode'.  (Currently Emacs <21.
         We might do this function properly in the future).
 
-        * progmodes/cc-cmds.el, cc-defs.el, cc-styles.el, cc-vars.el:
+        * progmodes/cc-cmds.el, progmodes/cc-defs.el:
+        * progmodes/cc-styles.el, progmodes/cc-vars.el:
         New macros c-sentence-end and c-default-value-sentence end, to cope
         with Emacs 22's new function `sentence-end'.
 
@@ -15779,7 +15781,7 @@
 
         * progmodes/cc-mode.el: Bind c-subword-mode to C-c C-w.
 
-        * progmodes/cc-subword.el, cc-cmds.el, cc-mode.el:
+        * progmodes/cc-subword.el, progmodes/cc-cmds.el, progmodes/cc-mode.el:
         Rename "c-subword-move-mode" as "c-subword-mode".
 
         * progmodes/cc-mode.el: Added tty suitable bindings for C-c
@@ -15810,7 +15812,7 @@
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-fonts.el, cc-vars.el
+        * progmodes/cc-fonts.el, progmodes/cc-vars.el
         (gtkdoc-font-lock-doc-comments, gtkdoc-font-lock-doc-protection)
         (gtkdoc-font-lock-keywords): GtkDoc patterns contributed by
         Masatake YAMATO.
@@ -15886,7 +15888,7 @@
         * progmodes/cc-cmds.el: Make C-c C-a (`c-toggle-auto-newline')
         forcibly enable c-electric-flag.
 
-        * progmodes/cc-vars.el, cc-cmds.el: New clean-up
+        * progmodes/cc-vars.el, progmodes/cc-cmds.el: New clean-up
         `comment-close-slash' on c-electric-slash: if enabled, typing `/' just
         after the comment-prefix of a C-style comment will close that comment.
 
@@ -15899,7 +15901,7 @@
         * progmodes/cc-langs.el (c-other-op-syntax-tokens): Only C++ has
         digraphs.
 
-        * progmodes/cc-fonts.el, cc-langs.el, cc-engine.el
+        * progmodes/cc-fonts.el, progmodes/cc-langs.el, progmodes/cc-engine.el
         (c-cpp-message-directives, c-cpp-include-directives)
         (c-opt-cpp-macro-define, c-opt-cpp-macro-define-start)
         (c-cpp-expr-directives): Introduce new language constants to
@@ -15909,7 +15911,7 @@
 
         (c-cpp-matchers, c-forward-to-cpp-define-body): Use them.
 
-        * progmodes/cc-langs.el, cc-fonts.el (c-string-escaped-newlines)
+        * progmodes/cc-langs.el, progmodes/cc-fonts.el (c-string-escaped-newlines)
         (c-multiline-string-start-char): New language constants and
         variables to specify how newlines in string literals work.
 
@@ -15923,13 +15925,13 @@
         (c-electric-brace): Indent syntactically after the cleanups since
         lineup functions might do it differently then.
 
-        * progmodes/cc-engine.el, cc-langs.el
+        * progmodes/cc-engine.el, progmodes/cc-langs.el
         (c-opt-op-identifier-prefix): New language constant and variable.
 
         (c-just-after-func-arglist-p, c-after-special-operator-id)
         (c-search-decl-header-end, c-inside-bracelist-p): Use it.
 
-        * progmodes/cc-align.el, cc-engine.el
+        * progmodes/cc-align.el, progmodes/cc-engine.el
         (c-after-special-operator-id): New helper to handle C++ operator
         identifiers.
 
@@ -16012,8 +16014,9 @@
         * progmodes/cc-cmds.el (c-show-syntactic-information): Show the
         anchor position(s) using faces.  Thanks to Masatake YAMATO for the idea.
 
-        * progmodes/cc-mode.el, cc-cmds.el, cc-defs.el, cc-engine.el
-        (c-submode-indicators): Change name from `c-auto-hungry-string'
+        * progmodes/cc-mode.el, progmodes/cc-cmds.el, progmodes/cc-defs.el:
+        * progmodes/cc-engine.el (c-submode-indicators):
+        Change name from `c-auto-hungry-string'
         since it's now used to track another submode.
 
         (c-update-modeline): Convert to function and extended to check
@@ -16084,7 +16087,7 @@
         to avoid heuristics that doesn't work for unclosed blocks.
         (c-at-statement-start-p): New function.
 
-        * progmodes/cc-engine.el, cc-fonts.el: Fixes in handling of
+        * progmodes/cc-engine.el, progmodes/cc-fonts.el: Fixes in handling of
         Objective-C directives, e.g. directives spanning lines should work
         reasonably well now.
 
@@ -16168,7 +16171,7 @@
         (c-forward-single-comment, c-backward-single-comment): Comment out
         the (now redundant) "special" AWK stuff.
 
-        * progmodes/cc-styles.el, cc-vars.el: Change the settings of
+        * progmodes/cc-styles.el, progmodes/cc-vars.el: Change the settings of
         c-string-par-start, c-string-par-separate to be more like Text
         Mode than Fundamental Mode.
 
@@ -16237,7 +16240,7 @@
         the checks for paren sexps between the point and the keyword, to
         avoid some false alarms.
 
-        * progmodes/cc-engine.el, cc-langs.el (c-looking-at-inexpr-block):
+        * progmodes/cc-engine.el, progmodes/cc-langs.el (c-looking-at-inexpr-block):
         Fixed a situation where an error could be thrown for unbalanced
         parens.  Changed to make use of c-keyword-member' to avoid some
         repeated regexp matches.
@@ -16278,7 +16281,8 @@
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-cmds.el, cc-styles.el, cc-vars.el: New variables
+        * progmodes/cc-cmds.el, progmodes/cc-styles.el:
+        * progmodes/cc-vars.el: New variables
         c-string-par-start/separate c-sentence-end-with-esc-eol,
         initialized in c-setup-paragraph-variables, used in string
         scanning subroutines of c-beginning-of-statement.
@@ -16288,7 +16292,7 @@
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-engine.el, cc-langs.el: Rewrote the recognition
+        * progmodes/cc-engine.el, progmodes/cc-langs.el: Rewrote the recognition
         function for declaration level blocks.  It should now cope with
         templates better and also be a lot more comprehensible.
 
@@ -16340,7 +16344,7 @@
         the point could be left directly after an open paren when finding
         the beginning of the first decl in the block.
 
-        * progmodes/cc-engine.el, cc-fonts.el (c-forward-keyword-clause):
+        * progmodes/cc-engine.el, progmodes/cc-fonts.el (c-forward-keyword-clause):
         Specify which submatch to use.
 
         * progmodes/cc-langs.el (c-symbol-start): Include `@' in ObjC.
@@ -16405,7 +16409,7 @@
         (c-specifier-key, c-not-decl-init-keywords): Some cleanup using new
         language constants `c-type-start-kwds' and `c-prefix-spec-kwds'.
 
-        * progmodes/cc-fonts.el, cc-langs.el, cc-engine.el:
+        * progmodes/cc-fonts.el, progmodes/cc-langs.el, progmodes/cc-engine.el:
         Internal cleanups to properly detect the declared identifiers in
         various declarations.
 
@@ -16446,11 +16450,12 @@
         * progmodes/cc-engine.el (c-maybe-labelp): Provide no default
         value - this variable is always dynamically bound.
 
-        * progmodes/cc-engine.el, cc-fonts.el, cc-langs.el, cc-menus.el
-        * cc-mode.el, cc-styles.el, cc-vars.el, cc-align.el, cc-awk.el
-        * cc-cmds.el, cc-defs.el: Change the policy for marking up
-        functions that might do hidden buffer changes: All such internal
-        functions are now marked instead of those that don't.
+        * progmodes/cc-engine.el, progmodes/cc-fonts.el, progmodes/cc-langs.el:
+        * progmodes/cc-menus.el, progmodes/cc-mode.el, progmodes/cc-styles.el:
+        * progmodes/cc-vars.el, progmodes/cc-align.el, progmodes/cc-awk.el:
+        * progmodes/cc-cmds.el, progmodes/cc-defs.el: Change the policy
+        for marking up functions that might do hidden buffer changes:
+        All such internal functions are now marked instead of those that don't.
 
         (c-beginning-of-macro, c-end-of-macro, c-(forward|backward)-comments)
         (c-(forward|backward)-single-comment, c-parse-state, c-on-identifier)
@@ -16495,7 +16500,8 @@
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-engine.el, cc-fonts.el, cc-langs.el: Cleaned up the
+        * progmodes/cc-engine.el, progmodes/cc-fonts.el:
+        * progmodes/cc-langs.el: Cleaned up the
         label handling.  Labels are now recognized in a uniform and more
         robust way, regardless of context.  Text properties are put on all
         labels to recognize the following declarations better.
@@ -16552,7 +16558,7 @@
         * progmodes/cc-align.el (c-lineup-arglist): Fix bug when the
         first argument starts with a special brace list.
 
-        * progmodes/cc-engine.el, cc-fonts.el (c-forward-decl-or-cast-1)
+        * progmodes/cc-engine.el, progmodes/cc-fonts.el (c-forward-decl-or-cast-1)
         (c-font-lock-declarations): Break out the declaration and cast
         recognition from `c-font-lock-declarations' to a new function, so
         that it can be used in the indentation engine.
@@ -16652,7 +16658,7 @@
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-fonts.el, cc-langs.el: Use `c-simple-ws' instead of
+        * progmodes/cc-fonts.el, progmodes/cc-langs.el: Use `c-simple-ws' instead of
         hardcoded char classes wherever possible.  Changed a couple of
         places to use skip by syntax instead of skip by char class.
 
@@ -16702,7 +16708,7 @@
         * progmodes/cc-cmds.el: Tidy c-beginning-of-sentence (and
         subfunctions) so that it works at BOB and EOB.
 
-        * progmodes/cc-cmds.el, cc-vars.el: More updating of
+        * progmodes/cc-cmds.el, progmodes/cc-vars.el: More updating of
         c-beginning-of-statement, including new variable
         c-block-comment-start-regexp.
 
@@ -16742,7 +16748,7 @@
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-engine.el, cc-fonts.el, cc-langs.el
+        * progmodes/cc-engine.el, progmodes/cc-fonts.el, progmodes/cc-langs.el
         (c-guess-basic-syntax): Change the way class-level labels are
         recognized; they can now contain essentially any symbols.
 
@@ -16765,7 +16771,7 @@
         Remove some cruft and fixed a bug that could cause it to go to a
         position further down.
 
-        * progmodes/cc-langs.el, cc-engine.el
+        * progmodes/cc-langs.el, progmodes/cc-engine.el
         (c-beginning-of-statement-1): Improve detection of labels in
         declaration contexts.
 
@@ -16780,7 +16786,7 @@
         * progmodes/cc-defs.el (c-forward-sexp, c-backward-sexp):
         Make these behave as documented when used at the buffer limits.
 
-        * progmodes/cc-mode.el, cc-engine.el, cc-langs.el
+        * progmodes/cc-mode.el, progmodes/cc-engine.el, progmodes/cc-langs.el
         (c-type-decl-end-used): Made this a language variable.
 
         * progmodes/cc-mode.el (c-after-change): Widen the buffer to work
@@ -16807,7 +16813,8 @@
         * progmodes/cc-mode.el (c-basic-common-init): Turn on syntax-table
         text property lookup only when it's needed.
 
-        * progmodes/cc-langs.el, cc-engine.el, cc-fonts.el, cc-mode.el:
+        * progmodes/cc-langs.el, progmodes/cc-engine.el:
+        * progmodes/cc-fonts.el, progmodes/cc-mode.el:
         Change the policy for paren marked angle brackets to be more
         persistent; once marked they remain marked even when they're found
         to be unbalanced in the searched region.  This should keep the
@@ -16852,27 +16859,29 @@
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-cmds.el, cc-engine.el, cc-langs.el, cc-vars.el:
+        * progmodes/cc-cmds.el, progmodes/cc-engine.el:
+        * progmodes/cc-langs.el, progmodes/cc-vars.el:
         Make the "Text Filling and Line Breaking" commands work for AWK buffers.
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-defs.el, cc-engine.el (c-mode-is-new-awk-p):
+        * progmodes/cc-defs.el, progmodes/cc-engine.el (c-mode-is-new-awk-p):
         Removed; (c-major-mode-is 'awk-mode) can be used instead now.
 
         * progmodes/cc-mode.el: Always set up AWK mode since emacsen where
         it doesn't work no longer are supported.
 
-        * progmodes/cc-mode.el, cc-styles.el, cc-vars.el, cc-defs.el
-        * cc-engine.el, cc-fonts.el, cc-langs.el, cc-cmds.el: CC Mode now
+        * progmodes/cc-mode.el, progmodes/cc-styles.el, progmodes/cc-vars.el:
+        * progmodes/cc-defs.el, progmodes/cc-engine.el, progmodes/cc-fonts.el:
+        * progmodes/cc-langs.el, progmodes/cc-cmds.el: CC Mode now
         requires support for the syntax-table' text property, which rules
         out Emacs 19 and XEmacs < 21.4.  Removed various compatibility
         cruft associated with those versions.
 
-        * progmodes/cc-defs.el, cc-fix.el: CC Mode now requires support
-        for the `syntax-table' text property, which rules out Emacs 19 and
-        XEmacs < 21.4.  Removed various compatibility cruft associated
-        with those versions.
+        * progmodes/cc-defs.el, progmodes/cc-fix.el: CC Mode now requires
+        support for the `syntax-table' text property, which rules out
+        Emacs 19 and XEmacs < 21.4.  Remove various compatibility cruft
+        associated with those versions.
 
         * progmodes/cc-vars.el (c-emacs-features): CC Mode now requires
         support for the `syntax-table' text property.
@@ -27408,14 +27417,14 @@
         * progmodes/cc-engine.el (c-guess-basic-syntax): Handle operator
         declarations somewhat better in C++.
 
-        * progmodes/cc-styles.el, cc-mode.el (c-run-mode-hooks):
+        * progmodes/cc-styles.el, progmodes/cc-mode.el (c-run-mode-hooks):
         New helper macro to make use of `run-mode-hooks'
         which has been added in Emacs 21.1.
         (c-mode, c++-mode, objc-mode, java-mode, idl-mode, pike-mode)
         (awk-mode): Use it.
         (make-local-hook): Suppress warning about obsolescence.
 
-        * progmodes/cc-engine.el, cc-align.el, cc-cmds.el
+        * progmodes/cc-engine.el, progmodes/cc-align.el, progmodes/cc-cmds.el
         (c-append-backslashes-forward, c-delete-backslashes-forward)
         (c-find-decl-spots, c-semi&comma-no-newlines-before-nonblanks):
         Compensate for return value from `forward-line' when it has moved
@@ -27428,9 +27437,9 @@
 
         CC Mode update to 5.30.10:
 
-        * progmodes/cc-mode.el, cc-engine.el, cc-align.el: Change the FSF's
-        address in the copyright statement.  Incidentally, change "along with
-        GNU Emacs" to "along with this program" where it occurs.
+        * progmodes/cc-mode.el, progmodes/cc-engine.el, progmodes/cc-align.el:
+        Change the FSF's address in the copyright statement.  Incidentally,
+        change "along with GNU Emacs" to "along with this program" where it occurs.
 
         * progmodes/cc-mode.el: Add a fourth parameter `t' to the awk-mode
         autoload, so that it is interactive, hence can be found by M-x awk-mode
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13
index a14426a2ce0..47c6144046c 100644
--- a/lisp/ChangeLog.13
+++ b/lisp/ChangeLog.13
@@ -541,7 +541,7 @@
 
 2008-02-01  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
-        * ps-print.ps: Fix background height.
+        * ps-print.el: Fix background height.
         (ps-print-version): New version 7.2.1.
 
 2008-02-01  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14
index d452836991b..52612a7a724 100644
--- a/lisp/ChangeLog.14
+++ b/lisp/ChangeLog.14
@@ -7565,7 +7565,7 @@
 
 2008-09-05  Wilson Snyder  <wsnyder@wsnyder.org>
 
-        * verilog-mode.el (verilog-library-extensions): Enable .sv
+        * progmodes/verilog-mode.el (verilog-library-extensions): Enable .sv
         filename extensions to call verilog-mode.
         (verilog-auto, verilog-auto-inst, verilog-faq)
         (verilog-submit-bug-report): Update author support URLs.
@@ -7592,7 +7592,7 @@
 
 2008-09-05  Michael McNamara  <mac@mail.brushroad.com>
 
-        * verilog-mode.el (verilog-beg-block-re-ordered, verilog-calc-1):
+        * progmodes/verilog-mode.el (verilog-beg-block-re-ordered, verilog-calc-1):
         Better support for the property statement.  Sometimes this keyword
         introduces a statement which requires an endproperty keyword, and
         sometimes it doesn't, depending on the work before the property
@@ -11807,7 +11807,7 @@
 
 2008-05-24  Ulf Jasper  <ulf.jasper@web.de>
 
-        * icalendar.el (icalendar-version): Increase to "0.19".
+        * calendar/icalendar.el (icalendar-version): Increase to "0.19".
         (icalendar--date-style): New function.
         (icalendar--datetime-to-diary-date): Doc fix.
         Use icalendar--date-style.
@@ -13390,10 +13390,6 @@
         (orgtbl-send-table): Use the previous two functions and implement
         multiple destinations for each table.
 
-        * doc/org.texi (A LaTeX example): Note that fmt may be a
-        one-argument function, and efmt may be a two-argument function.
-        (Radio tables): Document multiple destinations.
-
 2008-04-27  Carsten Dominik  <dominik@science.uva.nl>
 
         * org/org-agenda.el (org-add-to-diary-list): New function.
@@ -13508,7 +13504,7 @@
 
 2008-04-27  Andreas Schwab  <schwab@suse.de>
 
-        * Makefile.el: Unbreak bootstrap.
+        * Makefile.in: Unbreak bootstrap.
 
 2008-04-27  Michael Albinus  <michael.albinus@gmx.de>
 
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 8570b44dd42..97937c84fb1 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -5790,18 +5790,18 @@
         Enhance fontification of declarators to take account of the
         presence/absence of "typedef".
 
-        * cc-engine.el (c-forward-type): New &optional param
+        * progmodes/cc-engine.el (c-forward-type): New &optional param
         "brace-block-too".
         (c-forward-decl-or-cast-1): cdr of return value now indicates the
         presence of either or both of a "struct"-like keyword and "typedef".
 
-        * cc-fonts.el (c-complex-decl-matchers): Remove the heuristic
+        * progmodes/cc-fonts.el (c-complex-decl-matchers): Remove the heuristic
         fontification of declarators which follow a "}".
         (c-font-lock-declarations): Fontify declarators according to the
         presence/absence of "typedef".
 
-        * cc-langs.el (c-typedef-kwds c-typedef-key): New lang variable
-        for "typedef".
+        * progmodes/cc-langs.el (c-typedef-kwds c-typedef-key):
+        New lang variable for "typedef".
         (c-typedef-decl-key): New lang variable built from
         c-typedef-decl-kwds.
 
@@ -18135,6 +18135,10 @@
 
         * window.el (window-full-height-p): New function.  (Bug#4543)
 
+2009-10-03  Chong Yidong  <cyd@stupidchicken.com>
+
+        * files.el (auto-mode-alist): Add .srt and Project.ede.
+
 2009-10-03  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * vc.el: Remove commented out code.
diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16
index 4d525d9b836..d3b3dd3a576 100644
--- a/lisp/ChangeLog.16
+++ b/lisp/ChangeLog.16
@@ -965,7 +965,7 @@
 
 2013-02-13  Yves Baumes  <ybaumes@gmail.com>  (tiny change)
 
-        * lisp/emacs-lisp/package.el (package-menu-execute):
+        * emacs-lisp/package.el (package-menu-execute):
         Add optional noquery argument.  (Bug#13625)
 
 2013-02-13  Michael Albinus  <michael.albinus@gmx.de>
@@ -1408,7 +1408,7 @@
 
 2013-01-30  Jay Belanger  <jay.p.belanger@gmail.com>
 
-        * calc-units.el (math-default-units-table): Remove initial value.
+        * calc/calc-units.el (math-default-units-table): Remove initial value.
         (calc-convert-units): Treat expressions where all the units cancel as
         if they didn't have units.
 
@@ -1437,9 +1437,9 @@
 2013-01-29  Alan Mackenzie  <acm@muc.de>
 
         Amend to fontify /regexp/s in actions correctly.
-        * cc-awk.el (c-awk-harmless-char-re, c-awk-harmless-string*-re):
-        (c-awk-harmless-string*-here-re): Braces, parens and semicolons
-        are no longer included.
+        * progmodes/cc-awk.el (c-awk-harmless-char-re)
+        (c-awk-harmless-string*-re, c-awk-harmless-string*-here-re):
+        Braces, parens and semicolons are no longer included.
         (c-awk-harmless-line-char-re, c-awk-harmless-line-string*-re):
         What used to be these variables without "-line" in the name.
         (c-awk-neutral-re): { is no longer neutral.  Escaped newlines now are.
@@ -2813,7 +2813,7 @@
 
 2012-12-12  Jonas Bernoulli  <jonas@bernoul.li>
 
-        * lisp/emacs-lisp/eieio.el: Prettier object pretty-printing (bug#13115).
+        * emacs-lisp/eieio.el: Prettier object pretty-printing (bug#13115).
         (eieio-override-prin1): Don't quote kewords and booleans.
         (object-write) <eieio-default-superclass>: Don't put closing parens
         on new line, avoid needless empty lines, align values that are objects
@@ -5041,13 +5041,13 @@
         * startup.el (command-line): Mark window system is initialized
         after we've done it.
 
-        * common-win.el (x-select-text): Look for w32, not windows-nt.
+        * term/common-win.el (x-select-text): Look for w32, not windows-nt.
 
-        * ns-win.el: Require cl-lib.  Add ourselves to
+        * term/ns-win.el: Require cl-lib.  Add ourselves to
         display-format-alist.
         (ns-initialize-window-system): Assert we're not initialized twice.
 
-        * w32-win.el: Enable lexical binding; require cl-lib; add
+        * term/w32-win.el: Enable lexical binding; require cl-lib; add
         ourselves to display-format-alist.
         (w32-handle-dropped-file): Convert incoming dropped files from
         Windows paths to Cygwin ones before passing them on to the rest of
@@ -5055,7 +5055,7 @@
         (w32-drag-n-drop): New paramter new-frame.  Simplify logic.
         (w32-initialize-window-system): Assert we're not initialized twice.
 
-        * x-win.el: Require cl-lib; add ourselves to display-format-alist.
+        * term/x-win.el: Require cl-lib; add ourselves to display-format-alist.
         (x-initialize-window-system): Assert we're not initialized twice.
 
         * w32-common-fns.el: New File.
@@ -5894,8 +5894,8 @@
 
 2012-09-25  Wilson Snyder  <wsnyder@wsnyder.org>
 
-        * verilog-mode.el (verilog-auto-ascii-enum, verilog-auto-inout)
-        (verilog-auto-input, verilog-auto-insert-lisp)
+        * progmodes/verilog-mode.el (verilog-auto-ascii-enum)
+        (verilog-auto-inout, verilog-auto-input, verilog-auto-insert-lisp)
         (verilog-auto-output, verilog-auto-output-every, verilog-auto-reg)
         (verilog-auto-reg-input, verilog-auto-tieoff, verilog-auto-undef)
         (verilog-auto-unused, verilog-auto-wire)
@@ -8101,7 +8101,7 @@
 
 2012-08-04  Michal Nazarewicz  <mina86@mina86.com>
 
-        * lisp/mpc.el: Support password in host argument.
+        * mpc.el: Support password in host argument.
         (mpc--proc-connect): Parse and use new password element.
         Set mpc-proc variable instead of returning process.
         (mpc-proc): Adjust accordingly.
@@ -8204,17 +8204,17 @@
 
 2012-07-31  Jay Belanger  <jay.p.belanger@gmail.com>
 
-        * calc-mode.el (calc-basic-simplification-mode): Rename from
+        * calc/calc-mode.el (calc-basic-simplification-mode): Rename from
         `calc-limited-simplification-mode'.
         (calc-alg-simplification-mode): New function.
         (calc-set-simplify-mode): Adjust message.
 
-        * calc.el (calc-set-mode-line): Adjust mode line display for
+        * calc/calc.el (calc-set-mode-line): Adjust mode line display for
         basic simplification mode.
 
-        * calc-help.el (calc-m-prefix-help): Update help message.
+        * calc/calc-help.el (calc-m-prefix-help): Update help message.
 
-        * calc-ext.el (calc-init-extensions): Add bindings and autoloads
+        * calc/calc-ext.el (calc-init-extensions): Add bindings and autoloads
         for `calc-basic-simplify-mode' and `calc-alg-simplify-mode'.
 
 2012-07-31  Bastien Guerry  <bzg@gnu.org>
diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index ce9c9e791bf..a39e817ae3c 100644
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@@ -11004,7 +11004,7 @@
 1989-06-23  Joseph Arceneaux  (jla@all-bran.ai.mit.edu)
 
         * term/x-win.el (x-pop-up-window): Run hook x-pop-up-window-hook.
-        (x-color-screen-p): New macro; used to be C function.
+        (x-color-screen-p): New macro; used to be C function in xfns.c.
 
 1989-06-22  Richard Stallman  (rms@mole.ai.mit.edu)
 
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index e73b0d21f40..c0bf9824b4c 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -2437,20 +2437,6 @@
 
         * emacs-lisp/elp.el: A fix to follow coding conventions.
 
-        * gnus/binhex.el, gnus/binhex.el, gnus/earcon.el,
-        * gnus/gnus-agent.el, gnus/gnus-art.el, gnus/gnus-audio.el,
-        * gnus/gnus-logic.el, gnus/gnus-ml.el, gnus/gnus-mlspl.el,
-        * gnus/gnus-setup.el, gnus/gnus-srvr.el, gnus/gnus-sum.el,
-        * gnus/gnus-uu.el, gnus/gnus-vm.el, gnus/ietf-drums.el,
-        * gnus/mail-parse.el, gnus/mail-prsvr.el, gnus/mail-source.el,
-        * gnus/mm-bodies.el, gnus/mm-decode.el, gnus/mm-encode.el,
-        * gnus/mm-partial.el, gnus/mm-util.el, gnus/mm-uu.el,
-        * gnus/mm-view.el, gnus/mml.el, gnus/nnimap.el, gnus/nnoo.el,
-        * gnus/parse-time.el, gnus/rfc1843.el, gnus/rfc2045.el,
-        * gnus/rfc2047.el, gnus/rfc2104.el, gnus/rfc2231.el,
-        * gnus/time-date.el, gnus/uudecode.el: Some fixes to follow coding
-        conventions in files from Gnus.
-
         * abbrevlist.el, array.el, buff-menu.el, calendar/appt.el,
         * case-table.el, cdl.el, cmuscheme.el, compare-w.el, completion.el,
         * custom.el, derived.el, dired-aux.el, disp-table.el, dos-vars.el,
@@ -2569,7 +2555,7 @@
 
 2001-07-10  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-indent-exp): Keep the indentation of the block
+        * progmodes/cc-cmds.el (c-indent-exp): Keep the indentation of the block
         itself, i.e. only indent the contents in it.
 
 2001-07-10  Markus Rost  <rost@math.ohio-state.edu>
@@ -2601,7 +2587,7 @@
 
 2001-07-09  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el: Extended the kludge to interoperate with the
+        * progmodes/cc-cmds.el: Extended the kludge to interoperate with the
         delsel and pending-del packages wrt to the new function
         `c-electric-delete-forward'.
 
@@ -3648,14 +3634,14 @@
 
 2001-05-04  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-electric-delete, c-electric-delete-forward):
+        * progmodes/cc-cmds.el (c-electric-delete, c-electric-delete-forward):
         Split `c-electric-delete' into two functions where
         `c-electric-delete-forward' always deletes forward and
         `c-electric-delete' only contains the code necessary for XEmacs to
         choose between backward and forward deletion.
 
-        * cc-mode.el: `c-electric-delete-forward' is now bound to C-d to
-        get the electric behavior on that key too.
+        * progmodes/cc-mode.el: `c-electric-delete-forward' is now bound
+        to C-d to get the electric behavior on that key too.
         (c-fill-paragraph): Fixed bogus direct use of
         c-comment-prefix-regexp, which caused an error when it's a list.
 
@@ -4463,53 +4449,54 @@
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-mode.el, cc-vars.el (c-common-init, c-default-style):
+        * progmodes/cc-mode.el, progmodes/cc-vars.el (c-common-init)
+        (c-default-style):
         Removed the hardcoded switch to "java" style in Java mode.
         It's instead taken care of by the default value for c-default-style.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-align.el (c-lineup-math): Fix bug where lineup was
+        * progmodes/cc-align.el (c-lineup-math): Fix bug where lineup was
         triggered by equal signs in string literals.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-fill-paragraph): Fixed bug in the paragraph
+        * progmodes/cc-cmds.el (c-fill-paragraph): Fixed bug in the paragraph
         limit detection when at the ends of the buffer.
 
-        * cc-engine.el (c-guess-basic-syntax): Removed bogus check for
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Removed bogus check for
         "for" statement clause in case 7F; a better one is done
         earlier in case 7D anyway.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-guess-fill-prefix): Improved the heuristics
+        * progmodes/cc-cmds.el (c-guess-fill-prefix): Improved the heuristics
         somewhat more and did a small optimization.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-beginning-of-statement, c-end-of-statement):
+        * progmodes/cc-cmds.el (c-beginning-of-statement, c-end-of-statement):
         Use the limit argument only to limit the syntactic context
         search, not to limit the actual movement.
 
-        * cc-cmds.el (c-beginning-of-statement): Move by sentence
+        * progmodes/cc-cmds.el (c-beginning-of-statement): Move by sentence
         inside multiline strings, just like in comments.  Also various
         fixes to the paragraph and comment prefix recognition, block
         comment ender handling etc.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-fill-paragraph): Take more care to preserve
+        * progmodes/cc-cmds.el (c-fill-paragraph): Take more care to preserve
         the relative position of the point.
 
-        * cc-cmds.el (c-electric-continued-statement): New function to
+        * progmodes/cc-cmds.el (c-electric-continued-statement): New function to
         use as abbrev hook to reindent for keywords such as "else"
         that continues an earlier statement.
 
-        * cc-menus.el (cc-imenu-c++-generic-expression): Treat structs
+        * progmodes/cc-menus.el (cc-imenu-c++-generic-expression): Treat structs
         like classes.
 
-        * cc-mode.el (c-mode, c++-mode, java-mode, objc-mode)
+        * progmodes/cc-mode.el (c-mode, c++-mode, java-mode, objc-mode)
         (pike-mode): Populate the default abbrev tables to reindent for
         keywords such as "else" that can continue earlier statements.
         Abbrev mode is therefore turned on by default now.  (Note that
@@ -4518,30 +4505,30 @@
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-engine.el (c-inside-bracelist-p): Fix for handling
+        * progmodes/cc-engine.el (c-inside-bracelist-p): Fix for handling
         bracelists where the declaration contains template arguments.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-comment-indent):
+        * progmodes/cc-cmds.el (c-comment-indent):
         Use `c-get-syntactic-indentation' to correctly calculate the
         syntactic indentation.  Fixes bug with lineup functions that
         return vectors.
 
-        * cc-engine.el (c-get-syntactic-indentation): Split the
+        * progmodes/cc-engine.el (c-get-syntactic-indentation): Split the
         indentation sum calculation from `c-indent-line' to a separate
         function.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-beginning-of-statement, c-comment-indent):
+        * progmodes/cc-cmds.el (c-beginning-of-statement, c-comment-indent):
         Fixed places where it was assumed that preprocessor directives
         have to start in column zero.
 
-        * cc-engine.el (c-beginning-of-member-init-list): Handle C++
+        * progmodes/cc-engine.el (c-beginning-of-member-init-list): Handle C++
         template arguments after a class identifier properly.
 
-        * cc-engine.el (c-guess-basic-syntax): Treat initializer brace
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Treat initializer brace
         lists for `new Foo[]' constructs in Java as expressions and
         not top level definition brace lists on the top level, so that
         they'll get indented consistently with the same type of
@@ -4549,25 +4536,26 @@
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-fill-paragraph): The kludge that checks
+        * progmodes/cc-cmds.el (c-fill-paragraph): The kludge that checks
         whether the adaptive filling package fails to keep the comment
         prefix is now kludged further to check for filladapt-mode
         which doesn't have that problem. This is really icky, but it's
         the only way that works with the current misfeatures/bugs in
         both adaptive-fill-mode and filladapt-mode.
 
-        * cc-cmds.el (c-fill-paragraph): Made the way the paragraph
+        * progmodes/cc-cmds.el (c-fill-paragraph): Made the way the paragraph
         around point is recognized more robust.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el, cc-engine.el, cc-lobotomy.el (c-state-cache)
+        * progmodes/cc-cmds.el, progmodes/cc-engine.el:
+        * progmodes/cc-lobotomy.el (c-state-cache)
         (c-in-literal-cache, c-auto-fill-prefix, c-lit-limits)
         (c-lit-type): Fixed all internal variables used dynamically so
         that they are always bound.
 
-        * cc-cmds.el, cc-engine.el: Improved recovery of syntactic
-        errors:
+        * progmodes/cc-cmds.el, progmodes/cc-engine.el:
+        Improve recovery of syntactic errors:
 
         (c-indent-region): Fixed reporting of syntactic errors so that
         the region is fully reindented even when an error occurs.
@@ -4594,22 +4582,23 @@
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-beginning-of-statement): Fixed bugs with
+        * progmodes/cc-cmds.el (c-beginning-of-statement): Fixed bugs with
         paragraph recognition when moving by sentence in literals.
 
-        * cc-langs.el (c-Java-javadoc-paragraph-start): Modified paragraph
-        start regexp for javadoc to recognize javadoc markup in general instead
-        of a specific set of keywords, to be more future-safe.
+        * progmodes/cc-langs.el (c-Java-javadoc-paragraph-start): Modified
+        paragraph start regexp for javadoc to recognize javadoc markup in
+        general instead of a specific set of keywords, to be more future-safe.
 
         (c-Pike-pikedoc-paragraph-start)
         (c-Pike-pikedoc-paragraph-separate): New regexps to recognize
         pikedoc markup.
 
-        * cc-mode.el: Fixed initialization and use of c-current-comment-prefix.
+        * progmodes/cc-mode.el:
+        Fixed initialization and use of c-current-comment-prefix.
 
         (pike-mode): Initialize paragraph settings pikedoc recognition.
 
-        * cc-vars.el (c-default-style): Made a nicer Customize widget.
+        * progmodes/cc-vars.el (c-default-style): Made a nicer Customize widget.
 
         (c-comment-prefix-regexp): Made it possible to use an
         association list on this to specify mode specific regexps.
@@ -4621,114 +4610,116 @@
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-electric-brace): Fixed check for special brace
+        * progmodes/cc-cmds.el (c-electric-brace): Fixed check for special brace
         lists: We can't look at the syntax, since a brace list can get
         recognized as a plain statement-cont.
 
-        * cc-engine.el (c-guess-basic-syntax): Fixed bug where a
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bug where a
         special brace list opener broken over two lines got recognized
         as a statement on the second line.  Case 9A changed.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-electric-brace): Fixed bug in c-state-cache
+        * progmodes/cc-cmds.el (c-electric-brace): Fixed bug in c-state-cache
         adjustment after line is reindented.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-defs.el (c-point): Added optional argument for position
+        * progmodes/cc-defs.el (c-point): Added optional argument for position
         to use instead of the current point.
 
-        * cc-defs.el, cc-engine.el (c-add-class-syntax): Do not add
-        the in-expression block symbols when the construct starts at
-        boi, to avoid the extra level of indentation in that case.
+        * progmodes/cc-defs.el, progmodes/cc-engine.el (c-add-class-syntax):
+        Do not add the in-expression block symbols when the construct
+        starts at boi, to avoid the extra level of indentation in that case.
         Cases 4, 16A and 17E affected.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el: Use `indent-according-to-mode' instead of direct
+        * progmodes/cc-cmds.el: Use `indent-according-to-mode' instead of direct
         calls to `c-indent-line', to adhere better to Emacs conventions.
 
-        * cc-engine.el (c-indent-line): Use the syntax already bound
+        * progmodes/cc-engine.el (c-indent-line): Use the syntax already bound
         to `c-syntactic-context', if there is any.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-engine.el (c-get-offset): Fixed bug where the indentation
+        * progmodes/cc-engine.el (c-get-offset): Fixed bug where the indentation
         wasn't added up correctly when a lineup function returned nil.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-engine.el (c-collect-line-comments): Fixed bug where
+        * progmodes/cc-engine.el (c-collect-line-comments): Fixed bug where
         empty lines were ignored when collecting line comments backwards.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-align.el (c-lineup-dont-change): Return an absolute
+        * progmodes/cc-align.el (c-lineup-dont-change): Return an absolute
         indentation column to work correctly in the case when several
         syntactic elements are processed for the same line.
 
-        * cc-engine.el, cc-styles.el, cc-vars.el (c-evaluate-offset)
+        * progmodes/cc-engine.el, progmodes/cc-styles.el:
+        * progmodes/cc-vars.el (c-evaluate-offset)
         (c-get-offset, c-indent-line, c-valid-offset, c-read-offset)
         (c-set-offset): Added absolute indentation column settings by
         using the vector type.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el, cc-vars.el (c-electric-paren, c-cleanup-list):
+        * progmodes/cc-cmds.el, progmodes/cc-vars.el
+        (c-electric-paren, c-cleanup-list):
         Implemented two new cleanups `space-before-funcall' and
         `compact-empty-funcall'.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-defs.el (c-paren-re, c-identifier-re): Two new macros for
+        * progmodes/cc-defs.el (c-paren-re, c-identifier-re): Two new macros for
         helping building regexps.
 
-        * cc-engine.el (c-on-identifier): New function for detecting
+        * progmodes/cc-engine.el (c-on-identifier): New function for detecting
         identifiers.  It takes keywords into account.
 
-        * cc-langs.el, cc-mode.el: Added regexps for complete keyword
-        lists.  `c-keywords' is set to a regexp matching all keywords
-        in the current language.
+        * progmodes/cc-langs.el, progmodes/cc-mode.el: Added regexps for
+        complete keyword lists.  `c-keywords' is set to a regexp matching
+        all keywords in the current language.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-engine.el (c-beginning-of-statement-1): Added '#' to the
+        * progmodes/cc-engine.el (c-beginning-of-statement-1): Added '#' to the
         list of characters to skip backwards over at the beginning of
         a statement, since it can precede string literals in Pike.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-guess-fill-prefix): Fixed bug with prefix
+        * progmodes/cc-cmds.el (c-guess-fill-prefix): Fixed bug with prefix
         recognition when standing on the last line in a C++ comment
         with nothing but whitespace after the prefix.
 
-        * cc-engine.el (c-backward-to-start-of-if): Fixed bug when
+        * progmodes/cc-engine.el (c-backward-to-start-of-if): Fixed bug when
         given no limit argument.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-engine.el (c-inside-bracelist-p): Fixed brace list
+        * progmodes/cc-engine.el (c-inside-bracelist-p): Fixed brace list
         recognition for the `[]= operator symbol in Pike.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-bytecomp.el (cc-eval-when-compile): New macro that works
+        * progmodes/cc-bytecomp.el (cc-eval-when-compile): New macro that works
         around a bug in `eval-when-compile' in the byte compiler.
 
-        * cc-engine.el (c-forward-token-1): Fixed bug with return
+        * progmodes/cc-engine.el (c-forward-token-1): Fixed bug with return
         value when count is zero and there's no token start within the limit.
 
         (c-guess-basic-syntax): Don't add 'comment-intro to lines with
         "prefix comments", i.e. comments which are followed by code on
         the same line.
 
-        * cc-mode-19.el: Fixes so that checks that must be done at
+        * progmodes/cc-mode-19.el: Fixes so that checks that must be done at
         compile time also are done then.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-defs.el: Make sure cc-mode-19 is loaded both at compile
+        * progmodes/cc-defs.el: Make sure cc-mode-19 is loaded both at compile
         time and at runtime, and only when it's needed.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
@@ -4738,7 +4729,7 @@
         compilation orders. Thanks to Martin Buchholz for providing
         the basis for all this.
 
-        * cc-bytecomp.el: New file that provides some byte compilation
+        * progmodes/cc-bytecomp.el: New file that provides some byte compilation
         features: It ensures that files always are loaded from the
         current source directory during compilation, and it provides a
         set of macros to turn off specific compiler warnings for
@@ -4747,61 +4738,62 @@
         Fixed a nearly acyclic dependency tree (both runtime and
         compile-time) between all files.
 
-        * cc-defs.el: Separated all macros before the inline functions,
-        to ensure correct compilation.
+        * progmodes/cc-defs.el: Separated all macros before the
+        inline functions, to ensure correct compilation.
 
-        * cc-defs.el, cc-engine.el: Moved c-beginning-of-macro to from
-        cc-defs.el to cc-engine.el and made it a function instead.
+        * progmodes/cc-defs.el, progmodes/cc-engine.el: Moved
+        c-beginning-of-macro to from cc-defs.el to cc-engine.el and
+        made it a function instead.
 
-        * cc-mode-19.el: Patch the byte compiler in Emacs 19 not to warn
-        about char-after.
+        * progmodes/cc-mode-19.el: Patch the byte compiler in Emacs 19
+        not to warn about char-after.
 
-        * cc-vars.el: Cope even when there isn't a custom package
+        * progmodes/cc-vars.el: Cope even when there isn't a custom package
         containing defcustom available.
 
-        * cc-make.el: Removed since it's no longer necessary.
+        * progmodes/cc-make.el: Removed since it's no longer necessary.
 
         README: Updated installation instructions.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el, cc-langs.el, cc-mode.el: Moved around things to
-        improve the modularity: Moved all mode init stuff from
-        cc-langs.el to cc-mode.el, including the keymap
-        initialization; cc-langs now only contains the various
-        variables for configuring the language syntax.
+        * progmodes/cc-cmds.el, progmodes/cc-langs.el, progmodes/cc-mode.el:
+        Moved around things to improve the modularity:
+        Moved all mode init stuff from cc-langs.el to cc-mode.el,
+        including the keymap initialization; cc-langs now only contains
+        the various variables for configuring the language syntax.
 
-        * cc-engine.el, cc-styles.el (c-evaluate-offset)
+        * progmodes/cc-engine.el, progmodes/cc-styles.el (c-evaluate-offset)
         (c-get-offset): Moved from cc-styles to cc-engine since file
         dependency analysis suggests they belong there (which also
         makes more sense).  Thanks to Martin Buchholz for doing the analysis.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-fn-region-is-active-p): New function that
+        * progmodes/cc-cmds.el (c-fn-region-is-active-p): New function that
         wraps the corresponding macro, for use in places that aren't
         compiled.  Thanks to Martin Buchholz for pointing out this.
 
-        * cc-langs.el (c-mode-menu): Use c-fn-region-is-active-p.
+        * progmodes/cc-langs.el (c-mode-menu): Use c-fn-region-is-active-p.
 
-        * cc-mode.el (c-prepare-bug-report-hooks): Hook variable to
+        * progmodes/cc-mode.el (c-prepare-bug-report-hooks): Hook variable to
         add things to the bug report.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-guess-fill-prefix): Fixed bug where the
+        * progmodes/cc-cmds.el (c-guess-fill-prefix): Fixed bug where the
         returned prefix could contain a newline when the search for a
         good prefix line failed.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-toggle-auto-state, c-toggle-hungry-state)
+        * progmodes/cc-cmds.el (c-toggle-auto-state, c-toggle-hungry-state)
         (c-toggle-auto-hungry-state): Made the argument optional, as
         the documentation says it is.
 
 2000-03-21  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-engine.el (c-guess-basic-syntax): Don't treat the Pike
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Don't treat the Pike
         multiline string syntax, #"...", as a cpp macro.
 
 2001-03-21  Paul Eggert  <eggert@twinsun.com>
@@ -15271,31 +15263,31 @@
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-engine.el (c-looking-at-inexpr-block): Replaced a call to
+        * progmodes/cc-engine.el (c-looking-at-inexpr-block): Replaced a call to
         c-beginning-of-statement-1 that caused a bad case of recursion
         which could consume a lot of CPU in large classes in languages
         that have in-expression classes (i.e. Java and Pike).
 
-        * cc-engine.el (c-guess-basic-syntax): Check for in-expression
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Check for in-expression
         statements before top level constructs (i.e. case 6 is moved
         before case 5 and is now case 4) to catch in-expression
         classes in top level expressions correctly.
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-engine.el (c-guess-basic-syntax): Less naive handling of
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Less naive handling of
         objc-method-intro. Case 4 removed and case 5I added.
 
-        * cc-langs.el (c-append-paragraph-start): New variable used by
+        * progmodes/cc-langs.el (c-append-paragraph-start): New variable used by
         c-common-init to get paragraph-start correct.
-        * cc-langs.el (c-common-init): Use c-append-paragraph-start to
+        * progmodes/cc-langs.el (c-common-init): Use c-append-paragraph-start to
         initialize paragraph-start to make it correct both with and
         without the javadoc special case.
 
-        * cc-mode.el (java-mode): Use c-append-paragraph-start to
+        * progmodes/cc-mode.el (java-mode): Use c-append-paragraph-start to
         initialize paragraph-start for javadoc markup.
 
-        * cc-vars.el (c-style-variables-are-local-p): Incompatible
+        * progmodes/cc-vars.el (c-style-variables-are-local-p): Incompatible
         change by defaulting this to t.  It's motivated by the
         confusing behavior that otherwise arise from the style system
         when editing both java and non-java files at the same time
@@ -15303,84 +15295,84 @@
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-indent-new-comment-line): Added a kludge
+        * progmodes/cc-cmds.el (c-indent-new-comment-line): Added a kludge
         similar to the one in c-fill-paragraph to check the fill
         prefix from the adaptive fill function for sanity.
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-defs.el (c-end-of-defun-1): Fixed forward scanning into
+        * progmodes/cc-defs.el (c-end-of-defun-1): Fixed forward scanning into
         defun block.
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-align.el (c-lineup-multi-inher): Handle lines with
+        * progmodes/cc-align.el (c-lineup-multi-inher): Handle lines with
         leading comma nicely. Extended to handle member initializers
         too.
 
-        * cc-engine.el (c-beginning-of-inheritance-list)
+        * progmodes/cc-engine.el (c-beginning-of-inheritance-list)
         (c-guess-basic-syntax): Fixed recognition of inheritance lists
         when the lines begins with a comma.
 
-        * cc-vars.el (c-offsets-alist): Changed default for
+        * progmodes/cc-vars.el (c-offsets-alist): Changed default for
         member-init-cont to c-lineup-multi-inher since it now handles
         member initializers and indents better for leading commas.
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-electric-brace): Fixed some bugs in the state
+        * progmodes/cc-cmds.el (c-electric-brace): Fixed some bugs in the state
         handling that caused class open lines to be recognized as
         statement-conts in some cases.
 
-        * cc-cmds.el (c-indent-new-comment-line): Keep the fill prefix
+        * progmodes/cc-cmds.el (c-indent-new-comment-line): Keep the fill prefix
         guessed by the adaptive fill function unless point is on the
         first line of a block comment.
 
-        * cc-engine.el (c-forward-syntactic-ws): Fixed an infloop bug
+        * progmodes/cc-engine.el (c-forward-syntactic-ws): Fixed an infloop bug
         when the buffer ends with a macro continuation char.
 
-        * cc-engine.el (c-guess-basic-syntax): Added support for
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Added support for
         function definitions as statements in Pike.  The first
         statement in a lambda block is now labeled defun-block-intro
         instead of statement-block-intro.
 
-        * cc-engine.el (c-narrow-out-enclosing-class): Whack the state
+        * progmodes/cc-engine.el (c-narrow-out-enclosing-class): Whack the state
         so that the class surrounding point is selected, not the one
         innermost in the state.
 
-        * cc-engine.el (c-guess-basic-syntax): Fixed bug in
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bug in
         recognition of switch labels having hanging multiline
         statements.
 
-        * cc-engine.el (c-beginning-of-member-init-list): Broke out
+        * progmodes/cc-engine.el (c-beginning-of-member-init-list): Broke out
         some code in c-guess-basic-syntax to a separate function.
-        * cc-engine.el (c-just-after-func-arglist-p): Fixed
+        * progmodes/cc-engine.el (c-just-after-func-arglist-p): Fixed
         recognition of member inits with multiple line arglists.
-        * cc-engine.el (c-guess-basic-syntax): New case 5B.3 to detect
+        * progmodes/cc-engine.el (c-guess-basic-syntax): New case 5B.3 to detect
         member-init-cont when the commas are in funny places.
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-defs.el (c-auto-newline): Removed this macro since it's
+        * progmodes/cc-defs.el (c-auto-newline): Removed this macro since it's
         not used anymore.
 
-        * cc-engine.el (c-looking-at-bos): New helper function.
-        * cc-engine.el (c-looking-at-inexpr-block): More tests to tell
+        * progmodes/cc-engine.el (c-looking-at-bos): New helper function.
+        * progmodes/cc-engine.el (c-looking-at-inexpr-block): More tests to tell
         inexpr and toplevel classes apart in Pike.
 
-        * cc-engine.el (c-guess-basic-syntax): Fixed bogus recognition
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bogus recognition
         of case 9A.
 
-        * cc-langs.el, cc-mode.el (c-Pike-inexpr-class-key): New
-        constant, since "class" can introduce an in-expression class
-        in Pike nowadays.
+        * progmodes/cc-langs.el, progmodes/cc-mode.el
+        (c-Pike-inexpr-class-key): New constant, since "class" can
+        introduce an in-expression class in Pike nowadays.
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-align.el (c-gnu-impose-minimum): Don't impose minimum
+        * progmodes/cc-align.el (c-gnu-impose-minimum): Don't impose minimum
         indentation on cpp-macro lines.
 
-        * cc-engine.el (c-guess-basic-syntax): Made the cpp-macro
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Made the cpp-macro
         a syntax modifier like comment-intro, to make it possible to
         get syntactic indentation for preprocessor directives.  It's
         incompatible wrt to lineup functions on cpp-macro, but it has
@@ -15389,117 +15381,117 @@
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-engine.el (c-guess-basic-syntax): Fixed bug with missed
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bug with missed
         member-init-cont when the preceding arglist is several lines.
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-styles.el (c-style-alist): The basic offset for the BSD
+        * progmodes/cc-styles.el (c-style-alist): The basic offset for the BSD
         style corrected to 8.
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-styles.el (c-style-alist): Adjusted the indentation of
+        * progmodes/cc-styles.el (c-style-alist): Adjusted the indentation of
         brace list openers in the gnu style.
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-indent-command): Obey c-syntactic-indentation.
+        * progmodes/cc-cmds.el (c-indent-command): Obey c-syntactic-indentation.
 
-        * cc-cmds.el (c-electric-brace, c-electric-slash,
+        * progmodes/cc-cmds.el (c-electric-brace, c-electric-slash,
         c-electric-star, c-electric-semi&comma, c-electric-colon,
         c-electric-lt-gt, c-electric-paren): Don't reindent old lines
         when c-syntactic-indentation is nil.
 
-        * cc-engine.el (c-beginning-of-statement-1): Fixed bug where
+        * progmodes/cc-engine.el (c-beginning-of-statement-1): Fixed bug where
         we were left at comments preceding the first statement when
         reaching the beginning of the buffer.
 
-        * cc-vars.el (c-syntactic-indentation): New variable to turn
+        * progmodes/cc-vars.el (c-syntactic-indentation): New variable to turn
         off all syntactic indentation.
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-fill-paragraph): Keep one or two spaces
+        * progmodes/cc-cmds.el (c-fill-paragraph): Keep one or two spaces
         between the text and the block comment ender when it hangs,
         depending on how many there are before the fill.
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-engine.el (c-beginning-of-closest-statement): New helper
+        * progmodes/cc-engine.el (c-beginning-of-closest-statement): New helper
         function to go back to the closest preceding statement start,
         which could be inside a conditional statement.
-        * cc-engine.el (c-guess-basic-syntax): Use
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Use
         c-beginning-of-closest-statement in cases 10B.2, 17B and 17C.
 
-        * cc-engine.el (c-guess-basic-syntax): Better handling of
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Better handling of
         arglist-intro, arglist-cont-nonempty and arglist-close when
         the arglist is nested inside parens.  Cases 7A, 7C and 7F
         changed.
 
-        * cc-langs.el (c-Java-javadoc-paragraph-start): Brought
+        * progmodes/cc-langs.el (c-Java-javadoc-paragraph-start): Brought
         up-to-date with javadoc 1.2.
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-engine.el (c-beginning-of-statement-1): Fixed handling of
+        * progmodes/cc-engine.el (c-beginning-of-statement-1): Fixed handling of
         multiline Pike type decls.
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-cmds.el (c-indent-new-comment-line): Always break
+        * progmodes/cc-cmds.el (c-indent-new-comment-line): Always break
         multiline comments in multiline mode, regardless of
         comment-multi-line.
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-engine.el (c-guess-basic-syntax): Fixed bug with
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bug with
         fully::qualified::names in C++ member init lists.  Preamble in
         case 5D changed.
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-langs.el (c-common-init): Handling of obsolete variables
+        * progmodes/cc-langs.el (c-common-init): Handling of obsolete variables
         moved to c-initialize-cc-mode.  More compatible style override
         when using global style variables.
-        * cc-mode.el (c-initialize-cc-mode): Handling of obsolete
+        * progmodes/cc-mode.el (c-initialize-cc-mode): Handling of obsolete
         variables moved here.
 
-        * cc-styles.el (c-make-styles-buffer-local): Flag style
+        * progmodes/cc-styles.el (c-make-styles-buffer-local): Flag style
         variable localness in c-style-variables-are-local-p to make
         the compatibility measure in c-common-init work well.
 
-        * cc-styles.el (c-set-style-1): c-special-indent-hook can no
+        * progmodes/cc-styles.el (c-set-style-1): c-special-indent-hook can no
         longer contain set-from-style.
-        * cc-styles.el (c-initialize-builtin-style): Don't check for
+        * progmodes/cc-styles.el (c-initialize-builtin-style): Don't check for
         set-from-style on c-special-indent-hook.
-        * cc-styles.el (c-copy-tree): Obsolete.  The standard function
+        * progmodes/cc-styles.el (c-copy-tree): Obsolete.  The standard function
         copy-alist is sufficient now.
 
-        * cc-styles.el (c-set-style, c-set-style-1,
+        * progmodes/cc-styles.el (c-set-style, c-set-style-1,
         c-get-style-variables): Fixes to variable initialization so
         that duplicate entries in styles have the same effect
         regardless of DONT-OVERRIDE.
 
-        * cc-styles.el (c-set-style-2): Fixed bug where the
+        * progmodes/cc-styles.el (c-set-style-2): Fixed bug where the
         initialization of inheriting styles failed when the
         dont-override flag is set.
 
-        * cc-vars.el (c-special-indent-hook): Don't use set-from-style
+        * progmodes/cc-vars.el (c-special-indent-hook): Don't use set-from-style
         on this.
 
 2000-07-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * cc-defs.el (c-forward-comment): Removed the workaround
+        * progmodes/cc-defs.el (c-forward-comment): Removed the workaround
         introduced in 5.38 since it had worse side-effects.  If a line
         contains the string "//\"", it regarded the // as a comment
         start since the \ temporarily doesn't have escape syntax.
 
 2000-07-17  Emmanuel Briot  <briot@act-europe.fr>
 
-        * ada-mode.el: Got rid of all byte-compiler warnings on Emacs Load
-        ada-xref.el before ada-prj.el, so that the Project menu is created
-        when ada-prj tries to add to it.
+        * progmodes/ada-mode.el: Got rid of all byte-compiler warnings on
+        Emacs.  Load ada-xref.el before ada-prj.el, so that the Project
+        menu is created when ada-prj tries to add to it.
         (ada-activate-keys-for-case): Suppress the characters that are not
         part of the Ada syntax. Better compatibility with else-mode.
         (ada-adjust-case-interactive): When auto-casing is not active,
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 7d8326c9247..2dc68d484c6 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -29,7 +29,7 @@
         completable types, pull in types which are referenced through
         'using' statements, and also preserve their filenames.
 
-        * semanitc/bovine/c.el (semantic/analyze/refs): Require.
+        * semantic/bovine/c.el (semantic/analyze/refs): Require.
         (semantic-analyze-tag-references): New override.  Mainly copied
         from the default implementation, but if nothing could be found (or
         just the tag itself), drop all namespaces from the scope and
@@ -245,7 +245,7 @@
 
 2013-07-29  David Engster  <deng@randomsample.de>
 
-        * lisp/cedet/cedet.el (cedet-packages): Remove speedbar since its
+        * cedet.el (cedet-packages): Remove speedbar since its
         development does no longer happens in CEDET upstream but in Emacs
         proper.  Also remove cedet-contrib and cogre since those are only
         in upstream.
@@ -262,7 +262,7 @@
 
 2013-07-27  Eric Ludlam  <zappo@gnu.org>
 
-        * lisp/cedet/semantic/edit.el (semantic-edits-splice-remove):
+        * semantic/edit.el (semantic-edits-splice-remove):
         Wrap debug message removing middle tag in semantic-edits-verbose-flag
         check.
 
@@ -552,18 +552,15 @@
 
         * srecode/srt-mode.el:
         * srecode/compile.el:
-        * semantic/elp.el:
         * semantic/db-el.el:
         * semantic/complete.el:
         * ede.el:
-        * cogre.el:
         * srecode/table.el:
         * srecode/mode.el:
         * srecode/insert.el:
         * srecode/compile.el:
         * semantic/decorate/include.el:
         * semantic/db.el:
-        * semantic/adebug.el:
         * ede/auto.el:
         * srecode/dictionary.el:
         * semantic/ede-grammar.el:
@@ -2785,8 +2782,6 @@
 
         * srecode/srt-mode.el (srecode-template-mode): Doc fix.
 
-        * files.el (auto-mode-alist): Add .srt and Project.ede.
-
         * semantic.el (semantic-mode):
         Handle srecode-template-mode-hook as well.
         (semantic-mode): Use js-mode-hook for Javascript hook.
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index cd00df2422b..789b601540b 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -14703,6 +14703,15 @@
 
         * gnus-art.el, ...: Error convention changes.
 
+        * binhex.el, earcon.el, gnus-agent.el, gnus-art.el, gnus-audio.el:
+        * gnus-logic.el, gnus-ml.el, gnus-mlspl.el, gnus-setup.el:
+        * gnus-srvr.el, gnus-sum.el, gnus-uu.el, gnus-vm.el, ietf-drums.el:
+        * mail-parse.el, mail-prsvr.el, mail-source.el, mm-bodies.el:
+        * mm-decode.el, mm-encode.el, mm-partial.el, mm-util.el, mm-uu.el:
+        * mm-view.el, mml.el, nnimap.el, nnoo.el, parse-time.el, rfc1843.el:
+        * rfc2045.el, rfc2047.el, rfc2104.el, rfc2231.el, time-date.el:
+        * uudecode.el: Some fixes to follow coding conventions.
+
 2001-07-13 20:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * gnus-sum.el (gnus-rebuild-thread): Count hidden lines too.
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index e116129521f..03d3cdd45f3 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -5097,9 +5097,6 @@
         * org-agenda.el (org-agenda-show-clocking-issues)
         (org-agenda-format-item): Silence byte compiler.
 
-        * org-colview-xemacs.el (org-agenda-columns): Silence byte
-        compiler.
-
         * org-colview.el (org-agenda-columns): Silence byte compiler.
 
         * org.el (org-properties-postprocess-alist): Silence byte
@@ -13446,10 +13443,6 @@
 
 2012-01-03  Bastien Guerry  <bzg@gnu.org>
 
-        * org-mw.el (org-mw-export-lists): Fix list export.
-
-2012-01-03  Bastien Guerry  <bzg@gnu.org>
-
         * org-list.el (org-list-item-trim-br): New function.
         (org-list-to-generic): New parameter :nobr to use the new
         function.
@@ -14072,11 +14065,6 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-toc.el (org-toc-before-first-heading-p, org-toc-show)
-        (org-toc-get-headlines-status): Use `org-outline-regexp-bol'.
-
-2011-07-28  Bastien Guerry  <bzg@gnu.org>
-
         * org.el (org-outline-regexp-bol): New defconst.
         (org-outline-level, org-set-font-lock-defaults, org-cycle)
         (org-overview, org-content, org-flag-drawer)
@@ -18539,21 +18527,9 @@
         * ob-ref.el (org-babel-ref-parse): Allow passing empty strings
         into code blocks.
 
-2011-07-28  David Maus  <dmaus@ictsoc.de>
-
-        * test-org-table.el
-        (test-org-table/org-table-convert-refs-to-rc/3)
-        (test-org-table/org-table-convert-refs-to-rc/2)
-        (test-org-table/org-table-convert-refs-to-rc/1)
-        (test-org-table/org-table-convert-refs-to-an/3)
-        (test-org-table/org-table-convert-refs-to-an/2)
-        (test-org-table/org-table-convert-refs-to-an/1): Provide tests for
-        table formular format conversion.
-
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
-        * org.el (org-sort-entries): Fix sorting with a bold emphasis at
-        bol.
+        * org.el (org-sort-entries): Fix sorting with a bold emphasis at bol.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 0dfdb2a42ee..2c0195fc916 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -296,7 +296,7 @@
 
 2012-04-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * url-domsurf.el: New file (bug#1401).
+        * url-domsuf.el: New file (bug#1401).
 
         * url-cookie.el (url-cookie-two-dot-domains): Remove.
         (url-cookie-host-can-set-p): Use `url-domsuf-cookie-allowed-p'
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 38f8d75b089..52582532fb3 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -3291,7 +3291,7 @@
 
         * src: Remove directory.
 
-        * src\config.h, src\paths.h: Moved to parent dir, src removed.
+        * src/config.h, src/paths.h: Moved to parent dir, src removed.
 
 1995-04-09  Geoff Voelker  <voelker@cs.washington.edu>
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 8df6e31521d..9be8ee136e4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -654,7 +654,7 @@
         * conf_post.h: Include <stdbool.h>.
         (bool_bf): New type.
         * dispextern.h (TRACE, PREPARE_FACE_FOR_DISPLAY):
-        * interval.h (RESET_INTERVAL, COPY_INTERVAL_CACHE, MERGE_INTERVAL_CACHE)
+        * intervals.h (RESET_INTERVAL, COPY_INTERVAL_CACHE, MERGE_INTERVAL_CACHE)
         Surround statement macro with proper 'do { ... } while (false)' brackets.
         * dispextern.h (IF_DEBUG): Properly parenthesize and convert to void.
         Args must now be expressions; all callers changed.
@@ -3447,7 +3447,7 @@
         (Qbool_vector_p): Declare.
         (CHECK_BOOL_VECTOR, ROUNDUP, BITS_PER_SIZE_T): New macros.
         (swap16, swap32, swap64): New inline functions.
-        * macfont.c (macfont_shape): Change lint_assume to assume.
+        * macfont.m (macfont_shape): Change lint_assume to assume.
         * ralloc.c: Rename ROUNDUP to PAGE_ROUNDUP throughout.
         * xsettings.c (parse_settings): Use new swap16 and
         swap32 from lisp.h instead of file-specific macros.
@@ -3511,7 +3511,7 @@
         * process.h, process.c (PROCESS_INLINE):
         * syntax.h, syntax.c (SYNTAX_INLINE):
         * systime.h, sysdep.c (SYSTIME_INLINE):
-        * termhooks.h, terminal.h (TERMHOOKS_INLINE):
+        * termhooks.h, terminal.c (TERMHOOKS_INLINE):
         * window.h, window.c (WINDOW_INLINE):
         Remove.  All uses replaced with INLINE.
 
@@ -3718,7 +3718,7 @@
         (x_handle_dnd_message):
         * xsettings.c (xft_settings_event):
         Use 'const XEvent * const' where appropriate.
-        * xterm.h, gtkutil.h, xsettngs.h: Adjust related prototypes.
+        * xterm.h, gtkutil.h, xsettings.h: Adjust related prototypes.
 
 2013-09-16  Dmitry Antipov  <dmantipov@yandex.ru>
 
@@ -3760,7 +3760,7 @@
         (Fx_create_frame): Register macfont driver, make a better default font.
         (Fns_popup_font_panel): Get font from macfont driver, if used.
 
-        * macfont.m, macfont.h, maccuvs.h: New files.
+        * macfont.m, macfont.h, macuvs.h: New files.
 
         * font.h: Declare syms_of_macfont.
 
@@ -6065,7 +6065,7 @@
         New unwind-protect flavors to better type-check C callbacks.
         This also lessens the need to write wrappers for callbacks,
         and the need for make_save_pointer.
-        * alloca.c (free_save_value):
+        * alloc.c (free_save_value):
         * atimer.c (run_all_atimers):
         Now extern.
         * alloc.c (safe_alloca_unwind):
@@ -6074,13 +6074,13 @@
         * menu.c (cleanup_popup_menu) [HAVE_NS]:
         * minibuf.c (choose_minibuf_frame_1):
         * process.c (make_serial_process_unwind):
-        * xdisp.h (pop_message_unwind):
+        * xdisp.c (pop_message_unwind):
         * xselect.c (queue_selection_requests_unwind):
         Remove no-longer-needed wrapper.  All uses replaced by the wrappee.
-        * alloca.c (record_xmalloc):
+        * alloc.c (record_xmalloc):
         Prefer record_unwind_protect_ptr to record_unwind_protect with
         make_save_pointer.
-        * alloca.c (Fgarbage_collect):
+        * alloc.c (Fgarbage_collect):
         Prefer record_unwind_protect_void to passing a dummy.
         * buffer.c (restore_buffer):
         * window.c (restore_window_configuration):
@@ -6686,8 +6686,8 @@
         Use emacs_open more consistently when opening files.
         This handles EINTR more consistently now, and makes it easier
         to introduce other uniform changes to file descriptor handling.
-        * src/systdio.h: New file.
-        * src/buffer.c (mmap_init):
+        * sysstdio.h: New file.
+        * buffer.c (mmap_init):
         * cygw32.c (chdir_to_default_directory):
         * dispnew.c (Fopen_termscript):
         * emacs.c (Fdaemon_initialized):
diff --git a/src/ChangeLog.12 b/src/ChangeLog.12
index 07aedadccae..a9a1d9b1326 100644
--- a/src/ChangeLog.12
+++ b/src/ChangeLog.12
@@ -2400,7 +2400,7 @@
         * w32term.h (x_char_width, x_char_height): Likewise.
         * xfns.c (x_char_width, x_char_height): Remove.
         * w32fns.c (x_char_width, x_char_height): Likewise.
-        * nsfns.c (x_char_width, x_char_height): Likewise.
+        * nsfns.m (x_char_width, x_char_height): Likewise.
         * frame.c (Fframe_char_width): Use FRAME_COLUMN_WIDTH for
         all window frames.
         (Fframe_char_height): Likewise with FRAME_LINE_HEIGHT.
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 1a2763f8ff8..cee5d43ed57 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -15138,8 +15138,8 @@
 
 1989-06-23  Joseph Arceneaux  (jla@apple-gunkies.ai.mit.edu)
 
-        * xfns.c, lisp/term/x-win.el: C routine Fscreen_color_p now lisp
-        function x-color-screen-p in x-win.el.
+        * xfns.c: C routine Fscreen_color_p now lisp
+        function x-color-screen-p in lisp/term/x-win.el.
         (x_set_cursor_color): New method: first disallow same cursor as
         background, then if cursor not foreground, use it as cursor
         foreground.
diff --git a/test/ChangeLog b/test/ChangeLog
index 493d33784b5..1c26b408224 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -44,8 +44,8 @@
 
 2013-12-12  Nathan Trapuzzano  <nbtrap@nbtrap.com>
 
-        * automated/python-test.el (python-indent-block-enders-1): Rename
-        from python-indent-block-enders.
+        * automated/python-tests.el (python-indent-block-enders-1):
+        Rename from python-indent-block-enders.
         (python-indent-block-enders-2): New test.
 
 2013-12-08  Dmitry Gutov  <dgutov@yandex.ru>
@@ -131,9 +131,8 @@
 
 2013-11-20  Bozhidar Batsov <bozhidar@batsov.com>
 
-        * test/automated/ruby-mode-tests.el (ruby-exit!-font-lock):
+        * automated/ruby-mode-tests.el (ruby-exit!-font-lock):
         Add a failing test for Bug#15874.
-        * test/automated/ruby-mode-tests.el
         (ruby--insert-coding-comment-ruby-style)
         (ruby--insert-coding-comment-emacs-style)
         (ruby--insert-coding-comment-custom-style):
@@ -353,7 +352,7 @@
 
 2013-10-17  Barry O'Reilly  <gundaetiapo@gmail.com>
 
-        * test/automated/timer-tests.el: New file.  Tests that (sit-for 0)
+        * automated/timer-tests.el: New file.  Tests that (sit-for 0)
         allows another timer to run.
 
 2013-10-14  Dmitry Gutov  <dgutov@yandex.ru>
@@ -449,7 +448,7 @@
 
 2013-09-22  Daniel Colascione  <dancol@dancol.org>
 
-        * automated/data-test.el:
+        * automated/data-tests.el:
         (bool-vector-count-matches-all-0-nil)
         (bool-vector-count-matches-all-0-t)
         (bool-vector-count-matches-1-il, bool-vector-count-matches-1-t)
@@ -523,8 +522,8 @@
 
 2013-08-14  Daniel Hackney  <dan@haxney.org>
 
-        * package-test.el: Remove tar-package-building functions.  Tar file
-        used for testing is included in the repository.
+        * automated/package-test.el: Remove tar-package-building functions.
+        Tar file used for testing is included in the repository.
         (package-test-install-texinfo, package-test-cleanup-built-files):
         Remove.
 
@@ -772,7 +771,7 @@
 
 2013-05-26  Aidan Gauland  <aidalgol@amuri.net>
 
-        * tests/eshell.el: Rewrite tests using ERT.
+        * eshell.el: Rewrite tests using ERT.
 
 2013-05-25  Leo Liu  <sdl.web@gmail.com>
 
@@ -802,7 +801,7 @@
 
 2013-04-01  Masatake YAMATO  <yamato@redhat.com>
 
-        * automated/imenu-tests.el: New file.  (Bug#14112)
+        * automated/imenu-test.el: New file.  (Bug#14112)
 
 2013-04-19  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
@@ -1161,7 +1160,7 @@
         * automated/newsticker-tests.el
         (newsticker--group-manage-orphan-feeds): Use fset instead of flet.
 
-        * trunk/test/automated/newsticker-tests.el
+        * automated/newsticker-tests.el
         (newsticker--group-manage-orphan-feeds): Prevent updating
         newsticker treeview. Fixed bug#9763.