Some fixes to follow coding conventions.

118 files changed, 345 insertions, 165 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad854a49d2b..feafc6e99c4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,52 @@
 2001-07-15  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
+        * eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el,
+        eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el,
+        eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el,
+        eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el,
+        eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el,
+        eshell/em-xtra.el, eshell/esh-arg.el, eshell/esh-cmd.el,
+        eshell/esh-ext.el, eshell/esh-io.el, eshell/esh-maint.el,
+        eshell/esh-mode.el, eshell/esh-module.el, eshell/esh-opt.el,
+        eshell/esh-proc.el, eshell/esh-test.el, eshell/esh-util.el,
+        eshell/esh-var.el, eshell/eshell.el: Some fixes to follow coding
+        conventions in Eshell files.
+
+        * composite.el, diff.el, emacs-lisp/levents.el,
+        emacs-lisp/lmenu.el, emacs-lisp/lselect.el, emacs-lisp/lucid.el,
+        emulation/pc-mode.el, emulation/viper-cmd.el,
+        emulation/viper-ex.el, emulation/viper-init.el,
+        emulation/viper-keym.el, emulation/viper-macs.el,
+        emulation/viper-mous.el, emulation/viper-util.el,
+        emulation/viper.el, forms-pass.el, international/ccl.el,
+        international/characters.el, international/encoded-kb.el,
+        international/fontset.el, international/ja-dic-cnv.el,
+        international/ja-dic-utl.el, international/kinsoku.el,
+        international/kkc.el, international/mule-cmds.el,
+        international/mule-diag.el, international/mule-util.el,
+        international/mule.el, international/titdic-cnv.el,
+        language/china-util.el, language/chinese.el,
+        language/cyril-util.el, language/cyrillic.el, language/english.el,
+        language/greek.el, language/hebrew.el, language/japan-util.el,
+        language/japanese.el, language/korea-util.el, language/korean.el,
+        language/lao-util.el, language/lao.el, language/misc-lang.el,
+        language/slovak.el, language/thai-util.el, language/thai.el,
+        language/viet-util.el, language/vietnamese.el, mail/mh-comp.el,
+        mail/mh-e.el, mail/mh-funcs.el, mail/mh-mime.el, mail/mh-pick.el,
+        mail/mh-seq.el, mail/mh-utils.el, mail/sc.el, mail/unrmail.el,
+        midnight.el, patcomp.el, pcmpl-cvs.el, pcmpl-gnu.el,
+        pcmpl-linux.el, pcmpl-rpm.el, pcmpl-unix.el, play/studly.el,
+        play/zone.el, replace.el, select.el, subr.el, talk.el, term.el,
+        term/apollo.el, term/bobcat.el, term/linux.el, term/lk201.el,
+        term/vt102.el, term/vt125.el, term/vt200.el, term/vt201.el,
+        term/vt220.el, term/vt240.el, term/vt300.el, term/vt320.el,
+        term/vt400.el, term/vt420.el, x-apollo.el, x-menu.el: Some fixes
+        to follow coding conventions in files without maintainer or in
+        files with clear maintainer (but without Maintainer header stating
+        so).
+
+        * 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,
diff --git a/lisp/composite.el b/lisp/composite.el
index 42dcf1bb600..610ec227a60 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -1,4 +1,4 @@
-;;; composite.el --- Support character composition.
+;;; composite.el --- support character composition
 
 ;; Copyright (C) 1999 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
@@ -22,6 +22,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 ;;;###autoload
diff --git a/lisp/diff.el b/lisp/diff.el
index 358ad9a4c24..0e80b6a824f 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -1,4 +1,4 @@
-;;; diff.el --- Run `diff' in compilation-mode.
+;;; diff.el --- run `diff' in compilation-mode
 
 ;; Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
 
diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index 6ecb05b231f..f2f484f3e8b 100644
--- a/lisp/emacs-lisp/elp.el
+++ b/lisp/emacs-lisp/elp.el
@@ -2,10 +2,10 @@
 
 ;; Copyright (C) 1994,1995,1997,1998, 2001 Free Software Foundation, Inc.
 
-;; Author:        1994-1998 Barry A. Warsaw
-;; Maintainer:    FSF
-;; Created:       26-Feb-1994
-;; Keywords:      debugging lisp tools
+;; Author: Barry A. Warsaw
+;; Maintainer: FSF
+;; Created: 26-Feb-1994
+;; Keywords: debugging lisp tools
 
 ;; This file is part of GNU Emacs.
 
@@ -331,7 +331,7 @@ For example, to instrument all ELP functions, do the following:
     \\[elp-instrument-package] RET elp- RET"
   (interactive "sPrefix of package to instrument: ")
   (if (zerop (length prefix))
-      (error "Instrumenting all Emacs functions would render Emacs unusable."))
+      (error "Instrumenting all Emacs functions would render Emacs unusable"))
   (elp-instrument-list
    (mapcar
     'intern
@@ -362,7 +362,7 @@ Use optional LIST if provided instead."
   (interactive "aFunction to reset: ")
   (let ((info (get funsym elp-timer-info-property)))
     (or info
-        (error "%s is not instrumented for profiling." funsym))
+        (error "%s is not instrumented for profiling" funsym))
     (aset info 0 0)                     ;reset call counter
     (aset info 1 0.0)                   ;reset total time
     ;; don't muck with aref 2 as that is the old symbol definition
@@ -417,7 +417,7 @@ original definition, use \\[elp-restore-function] or \\[elp-restore-all]."
          (func (aref info 2))
          result)
     (or func
-        (error "%s is not instrumented for profiling." funsym))
+        (error "%s is not instrumented for profiling" funsym))
     (if (not elp-record-p)
         ;; when not recording, just call the original function symbol
         ;; and return the results.
@@ -591,4 +591,4 @@ displayed."
 
 (provide 'elp)
 
-;; elp.el ends here
+;;; elp.el ends here
diff --git a/lisp/emacs-lisp/levents.el b/lisp/emacs-lisp/levents.el
index 0cb860c6d44..2f25ad6555d 100644
--- a/lisp/emacs-lisp/levents.el
+++ b/lisp/emacs-lisp/levents.el
@@ -1,4 +1,4 @@
-;;; levents.el --- emulate the Lucid event data type and associated functions.
+;;; levents.el --- emulate the Lucid event data type and associated functions
 
 ;; Copyright (C) 1993 Free Software Foundation, Inc.
 
diff --git a/lisp/emacs-lisp/lmenu.el b/lisp/emacs-lisp/lmenu.el
index c28b5551cfa..17c6de63a7a 100644
--- a/lisp/emacs-lisp/lmenu.el
+++ b/lisp/emacs-lisp/lmenu.el
@@ -21,6 +21,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 
diff --git a/lisp/emacs-lisp/lselect.el b/lisp/emacs-lisp/lselect.el
index 9531ba18f51..e4114495a37 100644
--- a/lisp/emacs-lisp/lselect.el
+++ b/lisp/emacs-lisp/lselect.el
@@ -24,6 +24,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 ;;; The selection code requires us to use certain symbols whose names are
@@ -229,4 +231,4 @@ the kill ring or the Clipboard."
 
 (provide 'lselect)
 
-;;; lselect.el ends here.
+;;; lselect.el ends here
diff --git a/lisp/emacs-lisp/lucid.el b/lisp/emacs-lisp/lucid.el
index 11a246b0ea4..2674f39ab2a 100644
--- a/lisp/emacs-lisp/lucid.el
+++ b/lisp/emacs-lisp/lucid.el
@@ -1,4 +1,4 @@
-;;; lucid.el --- Emulate some Lucid Emacs functions.
+;;; lucid.el --- emulate some Lucid Emacs functions
 
 ;; Copyright (C) 1993, 1995 Free Software Foundation, Inc.
 
@@ -19,6 +19,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 ;; XEmacs autoloads CL so we might as well make use of it.
@@ -224,4 +226,4 @@ bottom of the buffer stack."
 
 (provide 'lucid)
 
-;;; end of lucid.el
+;;; lucid.el ends here
diff --git a/lisp/emulation/pc-mode.el b/lisp/emulation/pc-mode.el
index e10d97be3d7..3dc471359c8 100644
--- a/lisp/emulation/pc-mode.el
+++ b/lisp/emulation/pc-mode.el
@@ -1,4 +1,4 @@
-;;; pc-mode.el --- emulate certain key bindings used on PCs.
+;;; pc-mode.el --- emulate certain key bindings used on PCs
 
 ;; Copyright (C) 1995 Free Software Foundation, Inc.
 
@@ -21,6 +21,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 ;;;###autoload
@@ -51,4 +53,4 @@ C-Escape does list-buffers."
 
 (provide 'pc-mode)
 
-;; pc-mode.el ends here
+;;; pc-mode.el ends here
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index ce3b24c19cb..9033ac7ce02 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -18,7 +18,9 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
-;; Code
+;;; Commentary:
+
+;;; Code:
 
 (provide 'viper-cmd)
 (require 'advice)
@@ -1489,7 +1491,7 @@ If the prefix argument, ARG, is non-nil, it is used instead of `val'."
             (com (nth 2 viper-d-com))
             (reg (nth 3 viper-d-com)))
         (if (null val) (setq val (nth 1 viper-d-com)))
-        (if (null m-com) (error "No previous command to repeat."))
+        (if (null m-com) (error "No previous command to repeat"))
         (setq viper-use-register reg)
         (if (nth 4 viper-d-com) ; text inserted by command
             (setq viper-last-insertion (nth 4 viper-d-com)
@@ -4902,4 +4904,4 @@ Mail anyway (y or n)? ")
   
   
 
-;;;  viper-cmd.el ends here
+;;; viper-cmd.el ends here
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index 047ac5f9c18..3b01dd05241 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -19,7 +19,9 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
-;; Code
+;;; Commentary:
+
+;;; Code:
 
 (provide 'viper-ex)
 
@@ -1436,7 +1438,7 @@ reversed."
     (if name
         (if (eq 1 (length name))
             (setq char (string-to-char name))
-          (error "`%s': Spurious text \"%s\" after mark name."
+          (error "`%s': Spurious text \"%s\" after mark name"
                  name (substring name 1) viper-SpuriousText))
     (save-window-excursion
       (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name)) 
@@ -2221,4 +2223,4 @@ Please contact your system administrator. "
 
 
 
-;;;  viper-ex.el ends here
+;;; viper-ex.el ends here
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 3527e38414a..0ed9a632473 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -19,7 +19,9 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
-;; Code
+;;; Commentary:
+
+;;; Code:
 
 (provide 'viper-init)
 
@@ -986,4 +988,4 @@ Should be set in `~/.viper' file."
 ;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
 ;;; End:
 
-;;;  viper-ex.el ends here
+;;; viper-init.el ends here
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index c76c5511627..2df1b388755 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -19,7 +19,9 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
-;; Code
+;;; Commentary:
+
+;;; Code:
 
 (provide 'viper-keym)
 
@@ -630,4 +632,4 @@ form ((key . function) (key . function) ... )."
 ;;; End:
 
 
-;;;  viper-keym.el ends here
+;;; viper-keym.el ends here
diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el
index 92f5f013093..4eaf843f274 100644
--- a/lisp/emulation/viper-macs.el
+++ b/lisp/emulation/viper-macs.el
@@ -19,7 +19,9 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
-;; Code
+;;; Commentary:
+
+;;; Code:
 
 (provide 'viper-macs)
 
@@ -945,4 +947,4 @@ name from there."
     (call-last-kbd-macro)))
 
 
-;;;  viper-macs.el ends here
+;;; viper-macs.el ends here
diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el
index aaa8adb2745..b6036656851 100644
--- a/lisp/emulation/viper-mous.el
+++ b/lisp/emulation/viper-mous.el
@@ -19,7 +19,9 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
-;; Code
+;;; Commentary:
+
+;;; Code:
 
 (provide 'viper-mous)
 
@@ -247,7 +249,7 @@ On single or double click, returns the word as determined by
               (goto-char click-pos)
               (setq click-word
                     (funcall viper-surrounding-word-function count click-count)))
-          (error "Click must be over a window."))
+          (error "Click must be over a window"))
         click-word))))
 
 
@@ -664,4 +666,4 @@ This buffer may be different from the one where the click occurred."
 ;;; End:
 
 
-;;;  viper-mous.el ends here
+;;; viper-mous.el ends here
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 6956d0098e8..a27f20b626f 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -1,4 +1,4 @@
-;;; viper-util.el --- Utilities used by viper.el
+;;; viper-util.el --- utilities used by viper.el
 
 ;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 
@@ -19,8 +19,9 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
 
-;; Code
+;;; Code:
 
 ;; Compiler pacifier
 (defvar viper-overriding-map)
@@ -1382,4 +1383,4 @@ This option is appropriate if you like Emacs-style words."
 ;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
 ;;; End:
 
-;;;  viper-util.el ends here
+;;; viper-util.el ends here
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 9e8efaf8b0d..d4db005b972 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -1,10 +1,10 @@
-;;; viper.el --- A full-featured Vi emulator for GNU Emacs and XEmacs,
+;;; viper.el --- a full-featured Vi emulator for GNU Emacs and XEmacs,
 ;;               a VI Plan for Emacs Rescue,
 ;;               and a venomous VI PERil.
 ;;               Viper Is also a Package for Emacs Rebels.
 ;;
-;;  Keywords: emulations
-;;  Author: Michael Kifer <kifer@cs.sunysb.edu>
+;; Keywords: emulations
+;; Author: Michael Kifer <kifer@cs.sunysb.edu>
 
 ;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01 Free Software Foundation, Inc.
 
@@ -294,7 +294,7 @@
 ;;    much easier.
 ;;
 
-;; Code
+;;; Code:
 
 (require 'advice)
 (require 'cl)
@@ -1280,4 +1280,4 @@ These two lines must come in the order given.
 ;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
 ;;; End:
 
-;;;  viper.el ends here
+;;; viper.el ends here
diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el
index d6d1ba04092..0dd908be99c 100644
--- a/lisp/eshell/em-alias.el
+++ b/lisp/eshell/em-alias.el
@@ -1,4 +1,4 @@
-;;; em-alias --- creation and management of command aliases
+;;; em-alias.el --- creation and management of command aliases
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/em-banner.el b/lisp/eshell/em-banner.el
index 90d59f3f21e..dc5f52bcdc1 100644
--- a/lisp/eshell/em-banner.el
+++ b/lisp/eshell/em-banner.el
@@ -1,4 +1,4 @@
-;;; em-banner --- sample module that displays a login banner
+;;; em-banner.el --- sample module that displays a login banner
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el
index 52afff15b2a..49947eede77 100644
--- a/lisp/eshell/em-basic.el
+++ b/lisp/eshell/em-basic.el
@@ -1,4 +1,4 @@
-;;; em-basic --- basic shell builtin commands
+;;; em-basic.el --- basic shell builtin commands
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index 3b620b074d2..14407a8f236 100644
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -1,4 +1,4 @@
-;;; em-cmpl --- completion using the TAB key
+;;; em-cmpl.el --- completion using the TAB key
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el
index 89d4a408e95..140dc217bee 100644
--- a/lisp/eshell/em-dirs.el
+++ b/lisp/eshell/em-dirs.el
@@ -1,4 +1,4 @@
-;;; em-dirs --- directory navigation commands
+;;; em-dirs.el --- directory navigation commands
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index f4f9ebbe5b6..0e826756c57 100644
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -1,4 +1,4 @@
-;;; em-glob --- extended file name globbing
+;;; em-glob.el --- extended file name globbing
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index ef0a4b348c4..a5426f53001 100644
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -1,4 +1,4 @@
-;;; em-hist --- history list management
+;;; em-hist.el --- history list management
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index b7b080012f5..199c176b801 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -1,4 +1,4 @@
-;;; em-ls --- implementation of ls in Lisp
+;;; em-ls.el --- implementation of ls in Lisp
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el
index b258b0f9603..5f9d7524b6f 100644
--- a/lisp/eshell/em-pred.el
+++ b/lisp/eshell/em-pred.el
@@ -1,4 +1,4 @@
-;;; em-pred --- argument predicates and modifiers (ala zsh)
+;;; em-pred.el --- argument predicates and modifiers (ala zsh)
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
@@ -58,6 +58,8 @@ ordinary strings."
 ;; See the zsh docs for more on the syntax ([(zsh.info)Filename
 ;; Generation]).
 
+;;; Code:
+
 ;;; User Variables:
 
 (defcustom eshell-pred-load-hook '(eshell-pred-initialize)
diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index f94d244cab9..c0f179c12e3 100644
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -1,4 +1,4 @@
-;;; em-prompt --- command prompts
+;;; em-prompt.el --- command prompts
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el
index b58b294aff1..c52617633c1 100644
--- a/lisp/eshell/em-rebind.el
+++ b/lisp/eshell/em-rebind.el
@@ -1,4 +1,4 @@
-;;; em-rebind --- rebind keys when point is at current input
+;;; em-rebind.el --- rebind keys when point is at current input
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el
index 0dcc4d42e51..af7250b553c 100644
--- a/lisp/eshell/em-script.el
+++ b/lisp/eshell/em-script.el
@@ -1,4 +1,4 @@
-;;; em-script --- Eshell script files
+;;; em-script.el --- Eshell script files
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index 0d7810df9e2..fe787cd19e9 100644
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -1,4 +1,4 @@
-;;; em-smart --- smart display of output
+;;; em-smart.el --- smart display of output
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index c24fc993388..afd8e9596ef 100644
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -1,4 +1,4 @@
-;;; em-term --- running visual commands
+;;; em-term.el --- running visual commands
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index ae5c04e3ab6..6db127a45f4 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -1,4 +1,4 @@
-;;; em-unix --- UNIX command aliases
+;;; em-unix.el --- UNIX command aliases
 
 ;; Copyright (C) 1999, 2000, 2001 Free Software Foundation
 
diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el
index 98d2cbf6cdb..427eed3c1e2 100644
--- a/lisp/eshell/em-xtra.el
+++ b/lisp/eshell/em-xtra.el
@@ -1,4 +1,4 @@
-;;; em-xtra --- extra alias functions
+;;; em-xtra.el --- extra alias functions
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index 0b68bd69a0a..ff863042962 100644
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -1,4 +1,4 @@
-;;; esh-arg --- argument processing
+;;; esh-arg.el --- argument processing
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 88096be13e2..c5c61d311ed 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -1,4 +1,4 @@
-;;; esh-cmd --- command invocation
+;;; esh-cmd.el --- command invocation
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el
index 52ca3392a2c..691bbe6334d 100644
--- a/lisp/eshell/esh-ext.el
+++ b/lisp/eshell/esh-ext.el
@@ -1,4 +1,4 @@
-;;; esh-ext --- commands external to Eshell
+;;; esh-ext.el --- commands external to Eshell
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index fabb85cce9b..7e927198c26 100644
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -1,4 +1,4 @@
-;;; esh-io --- I/O management
+;;; esh-io.el --- I/O management
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/esh-maint.el b/lisp/eshell/esh-maint.el
index 89e50401c67..78de4e8ee0d 100644
--- a/lisp/eshell/esh-maint.el
+++ b/lisp/eshell/esh-maint.el
@@ -1,4 +1,4 @@
-;;; esh-maint --- init code for building eshell
+;;; esh-maint.el --- init code for building eshell
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index aea8158c7ce..c284f6f3ffc 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -1,4 +1,4 @@
-;;; esh-mode --- user interface
+;;; esh-mode.el --- user interface
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el
index f09f1ac7b24..176c6b33eeb 100644
--- a/lisp/eshell/esh-module.el
+++ b/lisp/eshell/esh-module.el
@@ -1,4 +1,4 @@
-;;; esh-module --- Eshell modules
+;;; esh-module.el --- Eshell modules
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el
index 6235c886599..85e30ca2180 100644
--- a/lisp/eshell/esh-opt.el
+++ b/lisp/eshell/esh-opt.el
@@ -1,4 +1,4 @@
-;;; esh-opt --- command options processing
+;;; esh-opt.el --- command options processing
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index dbe2e773524..d5ffa4c1c95 100644
--- a/lisp/eshell/esh-proc.el
+++ b/lisp/eshell/esh-proc.el
@@ -1,4 +1,4 @@
-;;; esh-proc --- process management
+;;; esh-proc.el --- process management
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/esh-test.el b/lisp/eshell/esh-test.el
index acfb409da57..2e4d9c69bec 100644
--- a/lisp/eshell/esh-test.el
+++ b/lisp/eshell/esh-test.el
@@ -1,4 +1,4 @@
-;;; esh-test --- Eshell test suite
+;;; esh-test.el --- Eshell test suite
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index 4edcb53761c..26de0a55eef 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -1,4 +1,4 @@
-;;; esh-util --- general utilities
+;;; esh-util.el --- general utilities
 
 ;; Copyright (C) 1999, 2000, 2001 Free Software Foundation
 
diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el
index fdb1ea106a8..9caa40ff6db 100644
--- a/lisp/eshell/esh-var.el
+++ b/lisp/eshell/esh-var.el
@@ -1,4 +1,4 @@
-;;; esh-var --- handling of variables
+;;; esh-var.el --- handling of variables
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index 4cccc7aea40..1ac4d6fb43a 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -1,4 +1,4 @@
-;;; eshell --- the Emacs command shell
+;;; eshell.el --- the Emacs command shell
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/forms-pass.el b/lisp/forms-pass.el
index 1a7db41e20a..34d4548434b 100644
--- a/lisp/forms-pass.el
+++ b/lisp/forms-pass.el
@@ -1,7 +1,13 @@
 ;;; forms-pass.el --- passwd file demo for forms-mode
 
+;; This file is part of GNU Emacs.
+
+;;; Commentary:
+
 ;; This demo visits your passwd file.
 
+;;; Code:
+
 ;; use yp if present
 (or (file-exists-p (setq forms-file "/var/yp/src/passwd"))
     (setq forms-file "/etc/passwd"))
@@ -23,3 +29,5 @@
        "\n\n"
        "Shell: "        7
        "\n"))
+
+;;; forms-pass.el ends here
diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el
index 5da5cab6ed8..2053b6364cb 100644
--- a/lisp/international/ccl.el
+++ b/lisp/international/ccl.el
@@ -317,7 +317,7 @@
 (defun ccl-check-register (arg cmd)
   (if (get arg 'ccl-register-number)
       arg
-    (error "CCL: Invalid register %s in %s." arg cmd)))
+    (error "CCL: Invalid register %s in %s" arg cmd)))
 
 ;; Check if ARG is a valid CCL command.
 (defun ccl-check-compile-function (arg cmd)
@@ -1483,4 +1483,4 @@ See the documentation of `define-ccl-program' for the detail of CCL program."
 
 (provide 'ccl)
 
-;; ccl.el ends here
+;;; ccl.el ends here
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index ea890448c4c..9b158bb2fe2 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -30,6 +30,8 @@
 ;; This file does not define the syntax for Latin-N character sets;
 ;; those are defined by the files latin-N.el.
 
+;;; Code:
+
 ;;; Predefined categories.
 
 ;; For each character set.
@@ -827,4 +829,4 @@
 ;;; coding: iso-2022-7bit
 ;;; End:
 
-;;; end of characters.el
+;;; characters.el ends here
diff --git a/lisp/international/encoded-kb.el b/lisp/international/encoded-kb.el
index 91041cceb62..fa3a6407c6b 100644
--- a/lisp/international/encoded-kb.el
+++ b/lisp/international/encoded-kb.el
@@ -1,4 +1,4 @@
-;;; encoded-kb.el --- Handler to input multibyte characters encoded somehow
+;;; encoded-kb.el --- handler to input multibyte characters encoded somehow
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
@@ -20,6 +20,10 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
+;;; Code:
+
 (defvar encoded-kbd-mode nil
   "Non-nil if in Encoded-kbd minor mode.")
 (put 'encoded-kbd-mode 'permanent-local t)
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index d0f3de09a64..c23ae218933 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -1,4 +1,4 @@
-;;; fontset.el --- Commands for handling fontset.
+;;; fontset.el --- commands for handling fontset
 
 ;; Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
@@ -22,6 +22,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 ;; Set standard fontname specification of characters in the default
diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el
index d6f3ccfb739..81b9fdc498c 100644
--- a/lisp/international/ja-dic-cnv.el
+++ b/lisp/international/ja-dic-cnv.el
@@ -1,4 +1,4 @@
-;;; ja-dic-cnv.el --- Convert a Japanese dictionary (SKK-JISYO.L) to Emacs Lisp
+;;; ja-dic-cnv.el --- convert a Japanese dictionary (SKK-JISYO.L) to Emacs Lisp
 
 ;; Copyright (C) 1995, 2000 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
@@ -562,8 +562,8 @@ To get complete usage, invoke:
 
 (provide 'ja-dic-cnv)
 
-;; ja-dic-cnv.el ends here
-
 ;; Local Variables:
 ;; coding: iso-2022-7bit
 ;; End:
+
+;;; ja-dic-cnv.el ends here
diff --git a/lisp/international/ja-dic-utl.el b/lisp/international/ja-dic-utl.el
index 245cdfd0637..6afeceb9a9e 100644
--- a/lisp/international/ja-dic-utl.el
+++ b/lisp/international/ja-dic-utl.el
@@ -1,4 +1,4 @@
-;;; ja-dic-utl.el --- Utilities for handling Japanese dictionary (SKK-JISYO.L)
+;;; ja-dic-utl.el --- utilities for handling Japanese dictionary (SKK-JISYO.L)
 
 ;; Copyright (C) 1995, 2000 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
@@ -213,8 +213,8 @@ LEIM is available from the same ftp directory as Emacs."))
 ;;
 (provide 'ja-dic-utl)
 
-;; ja-dic-utl.el ends here
-
 ;; Local Variables:
 ;; coding: iso-2022-7bit
 ;; End:
+
+;;; ja-dic-utl.el ends here
diff --git a/lisp/international/kinsoku.el b/lisp/international/kinsoku.el
index b845774fe55..4fc99bcac6a 100644
--- a/lisp/international/kinsoku.el
+++ b/lisp/international/kinsoku.el
@@ -1,4 +1,4 @@
-;;; kinsoku.el --- `Kinsoku' processing funcs. -*- coding: iso-2022-7bit; -*-
+;;; kinsoku.el --- `Kinsoku' processing funcs -*- coding: iso-2022-7bit; -*-
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
@@ -170,4 +170,4 @@ the context of text formatting."
               (aref (char-category-set (preceding-char)) ?<))
           (kinsoku-shorter linebeg))))
 
-;; kinsoku.el ends here
+;;; kinsoku.el ends here
diff --git a/lisp/international/kkc.el b/lisp/international/kkc.el
index 78d981affab..ff95fa18858 100644
--- a/lisp/international/kkc.el
+++ b/lisp/international/kkc.el
@@ -655,4 +655,4 @@ and change the current conversion to the last one in the group."
 ;;
 (provide 'kkc)
 
-;; kkc.el ends here
+;;; kkc.el ends here
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 2d95a531bd5..67aef2be068 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1,4 +1,4 @@
-;;; mule-cmds.el --- Commands for mulitilingual environment
+;;; mule-cmds.el --- commands for mulitilingual environment
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
@@ -23,6 +23,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 (eval-when-compile (defvar dos-codepage))
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 51ac6f79073..af4573ad788 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -1,4 +1,4 @@
-;;; mule-diag.el --- Show diagnosis of multilingual environment (Mule)
+;;; mule-diag.el --- show diagnosis of multilingual environment (Mule)
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
@@ -22,6 +22,10 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
+;;; Code:
+
 ;;; General utility function
 
 ;; Print all arguments with single space separator in one line.
diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el
index af5b608f6c8..f66420a8686 100644
--- a/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@ -1,4 +1,4 @@
-;;; mule-util.el --- Utility functions for mulitilingual environment (mule)
+;;; mule-util.el --- utility functions for mulitilingual environment (mule)
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
@@ -22,6 +22,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 ;;; String manipulations while paying attention to multibyte
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 4700abcc186..5d86f69bdea 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -23,6 +23,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 (defconst mule-version "5.0 (SAKAKI)" "\
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index 8865024f89b..b7ac8a93fd0 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -22,7 +22,7 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
-;;; Comments:
+;;; Commentary:
 
 ;; Convert cxterm dictionary (of TIT format) to quail-package.
 ;;
@@ -1179,8 +1179,8 @@ to store generated Quail packages."
         (miscdic-convert filename dir))))
   (kill-emacs 0))
 
-;;; titdic-cnv.el ends here
-
 ;; Local Variables:
 ;; coding: iso-2022-7bit
 ;; End:
+
+;;; titdic-cnv.el ends here
diff --git a/lisp/language/china-util.el b/lisp/language/china-util.el
index 6e4e68e26b0..8a0a83d834a 100644
--- a/lisp/language/china-util.el
+++ b/lisp/language/china-util.el
@@ -22,6 +22,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 ;; Hz/ZW encoding stuffs
diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index de9aee9252c..498b9c635ba 100644
--- a/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@ -1,4 +1,4 @@
-;;; chinese.el --- Support for Chinese -*- coding: iso-2022-7bit; -*-
+;;; chinese.el --- support for Chinese -*- coding: iso-2022-7bit; -*-
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el
index 0f6086a8797..e0b828a019d 100644
--- a/lisp/language/cyril-util.el
+++ b/lisp/language/cyril-util.el
@@ -1,4 +1,4 @@
-;;; cyril-util.el ---  utilities for Cyrillic scripts
+;;; cyril-util.el --- utilities for Cyrillic scripts
 
 ;; Copyright (C) 1997  Free Software Foundation, Inc.
 
@@ -21,6 +21,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 ;;;###autoload
@@ -189,8 +191,8 @@ If the argument is nil, we return the display table to its standard state."
 ;;
 (provide 'cyril-util)
 
-;;; cyril-util.el ends here
-
 ;; Local Variables:
 ;; coding: iso-2022-7bit
 ;; End:
+
+;;; cyril-util.el ends here
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 037869b6886..dbf51acbd52 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -1,4 +1,4 @@
-;;; cyrillic.el --- Support for Cyrillic -*- coding: iso-2022-7bit; -*-
+;;; cyrillic.el --- support for Cyrillic -*- coding: iso-2022-7bit; -*-
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
diff --git a/lisp/language/english.el b/lisp/language/english.el
index bba7e20b94d..cbfd206c204 100644
--- a/lisp/language/english.el
+++ b/lisp/language/english.el
@@ -1,4 +1,4 @@
-;;; english.el --- English support
+;;; english.el --- support for English
 
 ;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
@@ -28,7 +28,7 @@
 ;; English as a language environment is one of the ways to reset
 ;; various multilingual environment to the original settting.
 
-;;; Code
+;;; Code:
 
 (set-language-info-alist
  "English" '((tutorial . "TUTORIAL")
diff --git a/lisp/language/greek.el b/lisp/language/greek.el
index 385536d97b5..39702866755 100644
--- a/lisp/language/greek.el
+++ b/lisp/language/greek.el
@@ -1,4 +1,4 @@
-;;; greek.el --- Support for Greek
+;;; greek.el --- support for Greek
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el
index ec3edfce127..3579d2c394a 100644
--- a/lisp/language/hebrew.el
+++ b/lisp/language/hebrew.el
@@ -1,4 +1,4 @@
-;;; hebrew.el --- Support for Hebrew -*- coding: iso-2022-7bit; -*-
+;;; hebrew.el --- support for Hebrew -*- coding: iso-2022-7bit; -*-
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index 36dbefb4af7..465477c6550 100644
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -1,5 +1,4 @@
-;;; japan-util.el ---  utilities for Japanese -*- coding: iso-2022-7bit; -*-
-
+;;; japan-util.el --- utilities for Japanese -*- coding: iso-2022-7bit; -*-
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
@@ -24,6 +23,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 (defvar sentence-end-save nil)
diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index 92001e47c0b..20ec1aa2a50 100644
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -1,4 +1,4 @@
-;;; japanese.el --- Japanese support -*- coding: iso-2022-7bit; -*-
+;;; japanese.el --- support for Japanese -*- coding: iso-2022-7bit; -*-
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
diff --git a/lisp/language/korea-util.el b/lisp/language/korea-util.el
index 11438295a2e..9a945668c76 100644
--- a/lisp/language/korea-util.el
+++ b/lisp/language/korea-util.el
@@ -21,6 +21,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 ;;;###autoload
@@ -133,4 +135,4 @@
 ;;
 (provide 'korea-util)
 
-;;; korean-util.el ends here
+;;; korea-util.el ends here
diff --git a/lisp/language/korean.el b/lisp/language/korean.el
index 276e437360c..466e7cce0b2 100644
--- a/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@ -1,4 +1,4 @@
-;;; korean.el --- Support for Korean -*- coding: iso-2022-7bit; -*-
+;;; korean.el --- support for Korean -*- coding: iso-2022-7bit; -*-
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el
index dea365ad58b..1fca9c4dbb5 100644
--- a/lisp/language/lao-util.el
+++ b/lisp/language/lao-util.el
@@ -22,6 +22,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 ;; Setting information of Thai characters.
diff --git a/lisp/language/lao.el b/lisp/language/lao.el
index 7aae8f76db5..ec2a62943d3 100644
--- a/lisp/language/lao.el
+++ b/lisp/language/lao.el
@@ -1,4 +1,4 @@
-;;; lao.el --- Support for Lao -*- coding: iso-2022-7bit; -*-
+;;; lao.el --- support for Lao -*- coding: iso-2022-7bit; -*-
 
 ;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
@@ -22,6 +22,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 (make-coding-system
diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el
index 04ca63f55c4..fc47caee7f8 100644
--- a/lisp/language/misc-lang.el
+++ b/lisp/language/misc-lang.el
@@ -22,6 +22,10 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
+;;; Code:
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; IPA (International Phonetic Alphabet)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -40,4 +44,3 @@ and Italian.")))
 (provide 'misc-lang)
 
 ;;; misc-lang.el ends here
-
diff --git a/lisp/language/slovak.el b/lisp/language/slovak.el
index 709cf8ae8b5..cda4cbebe50 100644
--- a/lisp/language/slovak.el
+++ b/lisp/language/slovak.el
@@ -1,4 +1,4 @@
-;;; slovak.el --- Support for Slovak -*- coding: iso-2022-7bit; -*-
+;;; slovak.el --- support for Slovak -*- coding: iso-2022-7bit; -*-
 
 ;; Copyright (C) 1998, 2001 Free Software Foundation.
 
@@ -48,4 +48,4 @@ and select's the Slovak tutorial."))
 
 (provide 'slovak)
 
-;; slovak.el ends here
+;;; slovak.el ends here
diff --git a/lisp/language/thai-util.el b/lisp/language/thai-util.el
index 1a8802a3460..d2e4e116f3a 100644
--- a/lisp/language/thai-util.el
+++ b/lisp/language/thai-util.el
@@ -22,6 +22,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 ;; Setting information of Thai characters.
diff --git a/lisp/language/thai.el b/lisp/language/thai.el
index 7a1805fa81b..7ba4043e105 100644
--- a/lisp/language/thai.el
+++ b/lisp/language/thai.el
@@ -1,4 +1,4 @@
-;;; thai.el --- Support for Thai -*- coding: iso-2022-7bit; -*-
+;;; thai.el --- support for Thai -*- coding: iso-2022-7bit; -*-
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
diff --git a/lisp/language/viet-util.el b/lisp/language/viet-util.el
index d032eafd1d2..0268f6f0bb3 100644
--- a/lisp/language/viet-util.el
+++ b/lisp/language/viet-util.el
@@ -1,4 +1,4 @@
-;;; viet-util.el ---  utilities for Vietnamese  -*- coding: iso-2022-7bit; -*-
+;;; viet-util.el --- utilities for Vietnamese  -*- coding: iso-2022-7bit; -*-
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el
index 228cfff3c3b..92273b734af 100644
--- a/lisp/language/vietnamese.el
+++ b/lisp/language/vietnamese.el
@@ -1,4 +1,4 @@
-;;; vietnamese.el --- Support for Vietnamese -*- coding: iso-2022-7bit; -*-
+;;; vietnamese.el --- support for Vietnamese -*- coding: iso-2022-7bit; -*-
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
diff --git a/lisp/mail/mh-comp.el b/lisp/mail/mh-comp.el
index ebbb33a7c80..817cfeb0003 100644
--- a/lisp/mail/mh-comp.el
+++ b/lisp/mail/mh-comp.el
@@ -1,5 +1,5 @@
-;;; mh-comp --- mh-e functions for composing messages
-;; Time-stamp: <95/08/19 17:48:59 gildea>
+;;; mh-comp.el --- mh-e functions for composing messages
+;; Time-stamp: <2001-07-15 09:36:30 pavel>
 
 ;; Copyright (C) 1993,1995,1997,2000  Free Software Foundation, Inc.
 
@@ -7,7 +7,7 @@
 ;; Keywords: mail
 ;; Bug-reports: include `M-x mh-version' output in any correspondence
 
-;; This file is part of mh-e, part of GNU Emacs.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
 
 ;;; Change Log:
 
-;; $Id: mh-comp.el,v 1.20 2000/11/02 12:37:38 gerd Exp $
+;; $Id: mh-comp.el,v 1.21 2001/02/08 00:01:35 fx Exp $
 
 ;;; Code:
 
@@ -576,7 +576,7 @@ See also documentation for `\\[mh-send]' function."
                   (if (y-or-n-p
                         (format "A draft exists.  Use for %s? " use))
                       (if mh-error-if-no-draft
-                          (error "A prior draft exists."))
+                          (error "A prior draft exists"))
                     t)))
          (erase-buffer)
          (insert-file-contents initial-contents)
@@ -1103,3 +1103,5 @@ various types of components in a message, see
 (autoload 'mh-revert-mhn-edit "mh-mime"
   "Undoes the effect of \\[mh-edit-mhn] by reverting to the backup file.
 Optional non-nil argument means don't ask for confirmation." t)
+
+;;; mh-comp.el ends here
diff --git a/lisp/mail/mh-e.el b/lisp/mail/mh-e.el
index eb6b7994494..26db738a832 100644
--- a/lisp/mail/mh-e.el
+++ b/lisp/mail/mh-e.el
@@ -7,7 +7,7 @@
 ;; Keywords: mail
 ;; Bug-reports: include `M-x mh-version' output in any correspondence
 
-;; This file is part of mh-e, part of GNU Emacs.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@
 ;; Modified by James Larus, BBN, July 1984 and UCB, 1984 & 1985.
 ;; Rewritten for GNU Emacs, James Larus 1985.  larus@ginger.berkeley.edu
 ;; Modified by Stephen Gildea 1988.  gildea@lcs.mit.edu
-(defconst mh-e-RCS-id "$Id: mh-e.el,v 1.26 2000/08/16 20:38:40 monnier Exp $")
+(defconst mh-e-RCS-id "$Id: mh-e.el,v 1.27 2000/11/02 12:37:54 gerd Exp $")
 
 ;;; Code:
 
@@ -629,7 +629,7 @@ Flush mh-e's state out to MH.  The message at the cursor becomes current."
   (save-excursion
     (mh-goto-msg msg nil t)
     (if (looking-at mh-refiled-msg-regexp)
-        (error "Message %d is refiled.  Undo refile before deleting." msg))
+        (error "Message %d is refiled.  Undo refile before deleting" msg))
     (if (looking-at mh-deleted-msg-regexp)
         nil
         (mh-set-folder-modified-p t)
@@ -643,7 +643,7 @@ Flush mh-e's state out to MH.  The message at the cursor becomes current."
   (save-excursion
     (mh-goto-msg msg nil t)
     (cond ((looking-at mh-deleted-msg-regexp)
-           (error "Message %d is deleted.  Undo delete before moving." msg))
+           (error "Message %d is deleted.  Undo delete before moving" msg))
           ((looking-at mh-refiled-msg-regexp)
            (if (y-or-n-p
                 (format "Message %d already refiled.  Copy to %s as well? "
diff --git a/lisp/mail/mh-funcs.el b/lisp/mail/mh-funcs.el
index cc1ce6aec1b..944c6497d27 100644
--- a/lisp/mail/mh-funcs.el
+++ b/lisp/mail/mh-funcs.el
@@ -1,9 +1,9 @@
-;;; mh-funcs --- mh-e functions not everyone will use right away
-;; Time-stamp: <95/08/19 16:44:06 gildea>
+;;; mh-funcs.el --- mh-e functions not everyone will use right away
+;; Time-stamp: <2001-07-14 13:08:45 pavel>
 
 ;; Copyright (C) 1993, 1995 Free Software Foundation, Inc.
 
-;; This file is part of mh-e, part of GNU Emacs.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 
 ;;; Change Log:
 
-;; $Id: mh-funcs.el,v 1.4 1995/11/03 02:29:34 kwzh Exp erik $
+;; $Id: mh-funcs.el,v 1.5 1996/01/14 07:34:30 erik Exp $
 
 ;;; Code:
 
@@ -352,3 +352,4 @@ Default directory is the last directory used, or initially the value of
       (mh-handle-process-error command value))
     (insert "\n(mh-store finished)\n")))
         
+;;; mh-funcs.el ends here
diff --git a/lisp/mail/mh-mime.el b/lisp/mail/mh-mime.el
index 812a577ac41..e2d38f92d8b 100644
--- a/lisp/mail/mh-mime.el
+++ b/lisp/mail/mh-mime.el
@@ -1,9 +1,9 @@
-;;; mh-mime --- mh-e support for composing MIME messages
-;; Time-stamp: <95/08/19 16:45:17 gildea>
+;;; mh-mime.el --- mh-e support for composing MIME messages
+;; Time-stamp: <2001-07-15 09:52:45 pavel>
 
 ;; Copyright (C) 1993, 1995 Free Software Foundation, Inc.
 
-;; This file is part of mh-e, part of GNU Emacs.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 
 ;;; Change Log:
 
-;; $Id: mh-mime.el,v 1.7 1997/01/13 03:25:05 rms Exp kwzh $
+;; $Id: mh-mime.el,v 1.8 1998/09/23 21:51:50 kwzh Exp $
 
 ;;; Code:
 
@@ -234,8 +234,10 @@ Optional non-nil argument means don't ask for confirmation."
     (or noconfirm
         (yes-or-no-p (format "Revert buffer from file %s? "
                              backup-file))
-        (error "mhn edit revert not confirmed."))
+        (error "mhn edit revert not confirmed"))
     (let ((buffer-read-only nil))
       (erase-buffer)
       (insert-file-contents backup-file))
     (after-find-file nil)))
+
+;;; mh-mime.el ends here
diff --git a/lisp/mail/mh-pick.el b/lisp/mail/mh-pick.el
index a297d5e6f5c..c00a8d78dda 100644
--- a/lisp/mail/mh-pick.el
+++ b/lisp/mail/mh-pick.el
@@ -1,9 +1,9 @@
-;;; mh-pick --- make a search pattern and search for a message in mh-e
-;; Time-stamp: <95/08/19 16:45:16 gildea>
+;;; mh-pick.el --- make a search pattern and search for a message in mh-e
+;; Time-stamp: <2001-07-14 13:09:34 pavel>
 
 ;; Copyright (C) 1993, 1995 Free Software Foundation, Inc.
 
-;; This file is part of mh-e, part of GNU Emacs.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 
 ;;; Change Log:
 
-;; $Id: mh-pick.el,v 1.4 1995/11/03 02:30:09 kwzh Exp erik $
+;; $Id: mh-pick.el,v 1.5 1996/01/14 07:34:30 erik Exp $
 
 ;;; Code:
 
@@ -193,3 +193,5 @@ Add the messages found to the sequence named `search'."
 (define-key mh-pick-mode-map "\C-c\C-fr" 'mh-to-field)
 (define-key mh-pick-mode-map "\C-c\C-fs" 'mh-to-field)
 (define-key mh-pick-mode-map "\C-c\C-ft" 'mh-to-field)
+
+;;; mh-pick.el ends here
diff --git a/lisp/mail/mh-seq.el b/lisp/mail/mh-seq.el
index 59db6ee8f19..feb5ad11651 100644
--- a/lisp/mail/mh-seq.el
+++ b/lisp/mail/mh-seq.el
@@ -1,9 +1,9 @@
-;;; mh-seq --- mh-e sequences support
-;; Time-stamp: <95/08/19 16:45:15 gildea>
+;;; mh-seq.el --- mh-e sequences support
+;; Time-stamp: <2001-07-14 13:10:33 pavel>
 
 ;; Copyright (C) 1993, 1995 Free Software Foundation, Inc.
 
-;; This file is part of mh-e, part of GNU Emacs.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 
 ;;; Change Log:
 
-;; $Id: mh-seq.el,v 1.5 1996/01/14 07:34:30 erik Exp kwzh $
+;; $Id: mh-seq.el,v 1.6 1996/01/29 23:16:57 kwzh Exp $
 
 ;;; Code:
 
@@ -235,3 +235,4 @@ If optional prefix argument provided, then prompt for the message sequence."
       (goto-char location)
       (insert-buffer-substring (current-buffer) beginning-of-line end))))
 
+;;; mh-seq.el ends here
diff --git a/lisp/mail/mh-utils.el b/lisp/mail/mh-utils.el
index c71e51656df..8dd5ef3a163 100644
--- a/lisp/mail/mh-utils.el
+++ b/lisp/mail/mh-utils.el
@@ -1,9 +1,9 @@
 ;;; mh-utils.el --- mh-e code needed for both sending and reading
-;; Time-stamp: <95/10/22 17:58:16 gildea>
+;; Time-stamp: <2001-07-15 09:52:59 pavel>
 
 ;; Copyright (C) 1993, 1995, 1997, 2000 Free Software Foundation, Inc.
 
-;; This file is part of mh-e, part of GNU Emacs.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -579,7 +579,7 @@ Non-nil third argument means not to show the message."
             (if (not (mh-folder-name-p mh-draft-folder))
                 (setq mh-draft-folder (format "+%s" mh-draft-folder)))
             (if (not (file-exists-p (mh-expand-file-name mh-draft-folder)))
-                (error "Draft folder \"%s\" not found.  Create it and try again."
+                (error "Draft folder \"%s\" not found.  Create it and try again"
                        (mh-expand-file-name mh-draft-folder)))))
       (setq mh-inbox (mh-get-profile-field "Inbox:"))
       (cond ((not mh-inbox)
@@ -978,7 +978,7 @@ directory names."
                                                  (end-of-line)
                                                  (point))))
              (display-buffer (current-buffer))
-             (error "%s failed with status %d.  See error message in other window."
+             (error "%s failed with status %d.  See error message in other window"
                     command status)))))))
 
 
diff --git a/lisp/mail/sc.el b/lisp/mail/sc.el
index 70cc7fac3f5..1a90f68ef37 100644
--- a/lisp/mail/sc.el
+++ b/lisp/mail/sc.el
@@ -1,6 +1,12 @@
 ;;; sc.el --- old name for supercite
 
+;; This file is part of GNU Emacs.
+
+;;; Commentary:
+
+;;; Code:
+
 (require 'supercite)
 (provide 'sc)
 
-;; sc.el ends here
+;;; sc.el ends here
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 390335d1e34..039e3d5cf24 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -1,4 +1,4 @@
-;;; unrmail.el --- convert Rmail files to mailbox files.
+;;; unrmail.el --- convert Rmail files to mailbox files
 
 ;;; Copyright (C) 1992 Free Software Foundation, Inc.
 
@@ -21,6 +21,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 (defvar command-line-args-left) ;Avoid 'free variable' warning
diff --git a/lisp/midnight.el b/lisp/midnight.el
index 7183a3dad40..fe89a9d7bd3 100644
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -1,11 +1,11 @@
-;;; midnight.el --- run something every midnight, e.g., kill old buffers.
+;;; midnight.el --- run something every midnight, e.g., kill old buffers
 
 ;;; Copyright (C) 1998 Free Software Foundation, Inc.
 
-;;; Author: Sam Steingold <sds@usa.net>
-;;; Maintainer: Sam Steingold <sds@usa.net>
-;;; Created: 1998-05-18
-;;; Keywords: utilities
+;; Author: Sam Steingold <sds@usa.net>
+;; Maintainer: Sam Steingold <sds@usa.net>
+;; Created: 1998-05-18
+;; Keywords: utilities
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/patcomp.el b/lisp/patcomp.el
index 1470e82f367..ccc25308d30 100644
--- a/lisp/patcomp.el
+++ b/lisp/patcomp.el
@@ -1,5 +1,11 @@
 ;;; patcomp.el --- used by patch files to update Emacs releases
 
+;; This file is part of GNU Emacs.
+
+;;; Commentary:
+
+;;; Code:
+
 (defun batch-byte-recompile-emacs ()
   "Recompile the Emacs `lisp' directory.
 This is used after installing the patches for a new version."
@@ -12,3 +18,5 @@ This is used after installing the patches for a new version.
 It uses the command line arguments to specify the files to compile."
   (let ((load-path (list (expand-file-name "lisp"))))
     (batch-byte-compile)))
+
+;;; patcomp.el ends here
diff --git a/lisp/pcmpl-cvs.el b/lisp/pcmpl-cvs.el
index 854479d4305..af90beeef92 100644
--- a/lisp/pcmpl-cvs.el
+++ b/lisp/pcmpl-cvs.el
@@ -1,4 +1,4 @@
-;;; pcmpl-cvs --- functions for dealing with cvs completions
+;;; pcmpl-cvs.el --- functions for dealing with cvs completions
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el
index f7a681c803e..9153bf73e50 100644
--- a/lisp/pcmpl-gnu.el
+++ b/lisp/pcmpl-gnu.el
@@ -1,4 +1,4 @@
-;;; pcmpl-gnu --- completions for GNU project tools
+;;; pcmpl-gnu.el --- completions for GNU project tools
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
@@ -19,6 +19,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 (provide 'pcmpl-gnu)
diff --git a/lisp/pcmpl-linux.el b/lisp/pcmpl-linux.el
index 47698389497..83e4330d976 100644
--- a/lisp/pcmpl-linux.el
+++ b/lisp/pcmpl-linux.el
@@ -1,4 +1,4 @@
-;;; pcmpl-linux --- functions for dealing with GNU/Linux completions
+;;; pcmpl-linux.el --- functions for dealing with GNU/Linux completions
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el
index ae72e51ae55..f51208dbfab 100644
--- a/lisp/pcmpl-rpm.el
+++ b/lisp/pcmpl-rpm.el
@@ -1,4 +1,4 @@
-;;; pcmpl-rpm --- functions for dealing with rpm completions
+;;; pcmpl-rpm.el --- functions for dealing with rpm completions
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
@@ -324,6 +324,6 @@ You can use \\[eshell-report-bug] to do so."
                  (pcomplete-dirs-or-entries "\\.tar\\'")
                (pcomplete-dirs-or-entries "\\.spec\\'"))))))
        (t
-        (error "You must select a mode: -q, -i, -U, --verify, etc."))))))
+        (error "You must select a mode: -q, -i, -U, --verify, etc"))))))
 
 ;;; pcmpl-rpm.el ends here
diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el
index b990cb722d9..e4ed4cbf16b 100644
--- a/lisp/pcmpl-unix.el
+++ b/lisp/pcmpl-unix.el
@@ -1,4 +1,4 @@
-;;; pcmpl-unix --- standard UNIX completions
+;;; pcmpl-unix.el --- standard UNIX completions
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
@@ -19,6 +19,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 (provide 'pcmpl-unix)
diff --git a/lisp/play/studly.el b/lisp/play/studly.el
index f6764b45be5..5a73e041cb1 100644
--- a/lisp/play/studly.el
+++ b/lisp/play/studly.el
@@ -3,6 +3,8 @@
 ;;; This is in the public domain, since it was distributed
 ;;; by its author without a copyright notice in 1986.
 
+;; This file is part of GNU Emacs.
+
 ;; Keywords: games
 
 ;;; Commentary:
diff --git a/lisp/play/zone.el b/lisp/play/zone.el
index 87d69ac8709..90e9361c580 100644
--- a/lisp/play/zone.el
+++ b/lisp/play/zone.el
@@ -2,10 +2,10 @@
 
 ;; Copyright (C) 2000 Free Software Foundation, Inc.
 
-;;; Author: Victor Zandy <zandy@cs.wisc.edu>
-;;; Maintainer: Thien-Thi Nguyen <ttn@gnu.org>
-;;; Keywords: games
-;;; Created: June 6, 1998
+;; Author: Victor Zandy <zandy@cs.wisc.edu>
+;; Maintainer: Thien-Thi Nguyen <ttn@gnu.org>
+;; Keywords: games
+;; Created: June 6, 1998
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/replace.el b/lisp/replace.el
index cc817145ed2..b42839318c4 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1,4 +1,4 @@
-;;; replace.el --- replace commands for Emacs.
+;;; replace.el --- replace commands for Emacs
 
 ;; Copyright (C) 1985, 86, 87, 92, 94, 96, 1997, 2000, 2001
 ;;  Free Software Foundation, Inc.
diff --git a/lisp/select.el b/lisp/select.el
index 6e0231ca1fc..e0dc04ee3d0 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -1,4 +1,4 @@
-;;; select.el --- lisp portion of standard selection support.
+;;; select.el --- lisp portion of standard selection support
 
 ;; Keywords: internal
 
@@ -22,6 +22,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 ;; This is for temporary compatibility with pre-release Emacs 19.
@@ -314,4 +316,4 @@ Cut buffers are considered obsolete; you should use selections instead."
 
 (provide 'select)
 
-;;; select.el ends here.
+;;; select.el ends here
diff --git a/lisp/subr.el b/lisp/subr.el
index ffb6f7f0ca6..f2f71a3fe3b 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -20,6 +20,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 (defvar custom-declare-variable-list nil
   "Record `defcustom' calls made before `custom.el' is loaded to handle them.
diff --git a/lisp/talk.el b/lisp/talk.el
index a159b93311e..4761ef03cf9 100644
--- a/lisp/talk.el
+++ b/lisp/talk.el
@@ -1,4 +1,4 @@
-;;; talk.el --- Allow several users to talk to each other through Emacs.
+;;; talk.el --- allow several users to talk to each other through Emacs
 
 ;; Copyright (C) 1995 Free Software Foundation, Inc.
 
diff --git a/lisp/term.el b/lisp/term.el
index dcbcd0aacd6..f4591e16f4e 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -2,9 +2,9 @@
 
 ;;; Copyright (C) 1988, 1990, 1992, 1994, 1995 Free Software Foundation, Inc.
 
-;;; Author: Per Bothner <bothner@cygnus.com>
-;;; Based on comint mode written by: Olin Shivers <shivers@cs.cmu.edu>
-;;; Keywords: processes
+;; Author: Per Bothner <bothner@cygnus.com>
+;; Based on comint mode written by: Olin Shivers <shivers@cs.cmu.edu>
+;; Keywords: processes
 
 ;; This file is part of GNU Emacs.
 
@@ -31,6 +31,8 @@
 
 ;;; To see what I've modified and where it came from search for '-mm'
 
+;;; Commentary:
+
 ;;; Speed considerations and a few caveats
 ;;; --------------------------------------
 ;;;
@@ -390,7 +392,7 @@
 ;; term-mode-hook is the term mode hook.  Basically for your keybindings.
 ;; term-load-hook is run after loading in this package.
 
-;; Code:
+;;; Code:
 
 ;; This is passed to the inferior in the EMACS environment variable,
 ;; so it is important to increase it if there are protocol-relevant changes.
diff --git a/lisp/term/apollo.el b/lisp/term/apollo.el
index ffe8e6bb1a6..1dc3658048b 100644
--- a/lisp/term/apollo.el
+++ b/lisp/term/apollo.el
@@ -1 +1,3 @@
 (load "term/vt100" nil t)
+
+;;; apollo.el ends here
diff --git a/lisp/term/bobcat.el b/lisp/term/bobcat.el
index f106b8b75c2..c9fd9c2c64e 100644
--- a/lisp/term/bobcat.el
+++ b/lisp/term/bobcat.el
@@ -1,2 +1,4 @@
 ;;; HP terminals usually encourage using ^H as the rubout character
 (load "term/keyswap" nil t)
+
+;;; bobcat.el ends here
diff --git a/lisp/term/linux.el b/lisp/term/linux.el
index e46efa073dd..a6f560999f5 100644
--- a/lisp/term/linux.el
+++ b/lisp/term/linux.el
@@ -10,3 +10,5 @@
 (let ((value (current-input-mode)))
   ;; The third arg only matters in that it is not t or nil.
   (set-input-mode (nth 0 value) (nth 1 value) 'iso-latin-1 (nth 3 value)))
+
+;;; linux.el ends here
diff --git a/lisp/term/lk201.el b/lisp/term/lk201.el
index aedf221b4f1..cb03f446020 100644
--- a/lisp/term/lk201.el
+++ b/lisp/term/lk201.el
@@ -66,3 +66,5 @@
 (define-key function-key-map "\eOw" [kp-7])
 (define-key function-key-map "\eOx" [kp-8])
 (define-key function-key-map "\eOy" [kp-9])
+
+;;; lk201.el ends here
diff --git a/lisp/term/vt102.el b/lisp/term/vt102.el
index ffe8e6bb1a6..6971e3a21c8 100644
--- a/lisp/term/vt102.el
+++ b/lisp/term/vt102.el
@@ -1 +1,3 @@
 (load "term/vt100" nil t)
+
+;;; vt102.el ends here
diff --git a/lisp/term/vt125.el b/lisp/term/vt125.el
index ffe8e6bb1a6..392693c2cd0 100644
--- a/lisp/term/vt125.el
+++ b/lisp/term/vt125.el
@@ -1 +1,3 @@
 (load "term/vt100" nil t)
+
+;;; vt125.el ends here
diff --git a/lisp/term/vt200.el b/lisp/term/vt200.el
index 31f64a0f8b2..fc63f06dbda 100644
--- a/lisp/term/vt200.el
+++ b/lisp/term/vt200.el
@@ -4,3 +4,5 @@
 
 ;; Make F11 an escape key.
 (define-key function-key-map "\e[23~" [?\e])
+
+;;; vt200.el ends here
diff --git a/lisp/term/vt201.el b/lisp/term/vt201.el
index c9cb12521dc..4708604b00f 100644
--- a/lisp/term/vt201.el
+++ b/lisp/term/vt201.el
@@ -5,3 +5,4 @@
 ;; Make F11 an escape key.
 (define-key function-key-map "\e[23~" [?\e])
 
+;;; vt201.el ends here
diff --git a/lisp/term/vt220.el b/lisp/term/vt220.el
index c9cb12521dc..daa52e89d49 100644
--- a/lisp/term/vt220.el
+++ b/lisp/term/vt220.el
@@ -5,3 +5,4 @@
 ;; Make F11 an escape key.
 (define-key function-key-map "\e[23~" [?\e])
 
+;;; vt220.el ends here
diff --git a/lisp/term/vt240.el b/lisp/term/vt240.el
index 31f64a0f8b2..62639025855 100644
--- a/lisp/term/vt240.el
+++ b/lisp/term/vt240.el
@@ -4,3 +4,5 @@
 
 ;; Make F11 an escape key.
 (define-key function-key-map "\e[23~" [?\e])
+
+;;; vt240.el ends here
diff --git a/lisp/term/vt300.el b/lisp/term/vt300.el
index a4a0a6e359a..26485063787 100644
--- a/lisp/term/vt300.el
+++ b/lisp/term/vt300.el
@@ -2,3 +2,5 @@
 
 ;; Make F11 an escape key.
 (define-key function-key-map "\e[23~" [?\e])
+
+;;; vt300.el ends here
diff --git a/lisp/term/vt320.el b/lisp/term/vt320.el
index a4a0a6e359a..93aee9779be 100644
--- a/lisp/term/vt320.el
+++ b/lisp/term/vt320.el
@@ -2,3 +2,5 @@
 
 ;; Make F11 an escape key.
 (define-key function-key-map "\e[23~" [?\e])
+
+;;; vt320.el ends here
diff --git a/lisp/term/vt400.el b/lisp/term/vt400.el
index a4a0a6e359a..049944ea683 100644
--- a/lisp/term/vt400.el
+++ b/lisp/term/vt400.el
@@ -2,3 +2,5 @@
 
 ;; Make F11 an escape key.
 (define-key function-key-map "\e[23~" [?\e])
+
+;;; vt400.el ends here
diff --git a/lisp/term/vt420.el b/lisp/term/vt420.el
index a4a0a6e359a..71c13490feb 100644
--- a/lisp/term/vt420.el
+++ b/lisp/term/vt420.el
@@ -2,3 +2,5 @@
 
 ;; Make F11 an escape key.
 (define-key function-key-map "\e[23~" [?\e])
+
+;;; vt420.el ends here
diff --git a/lisp/x-apollo.el b/lisp/x-apollo.el
index c2cb69d46dd..4aec15d9131 100644
--- a/lisp/x-apollo.el
+++ b/lisp/x-apollo.el
@@ -19,6 +19,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 (defun apollo-kill-entire-line ()
diff --git a/lisp/x-menu.el b/lisp/x-menu.el
index cad653f0303..9a3edba771b 100644
--- a/lisp/x-menu.el
+++ b/lisp/x-menu.el
@@ -1,4 +1,4 @@
-;;; x-menu.el --- menu support for X 
+;;; x-menu.el --- menu support for X
 
 ;; Copyright (C) 1986 Free Software Foundation, Inc.
 
@@ -19,6 +19,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 (defun x-menu-mode ()