*** empty log message ***

140 files changed, 1288 insertions, 537 deletions

diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 3cbeb19391b..0b0247d8dfe 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -1,12 +1,15 @@
 ;;; abbrev.el --- abbrev mode commands for Emacs
 
-;; Copyright (C) 1985-1991 Free Software Foundation, Inc.
+;; Maintainer: FSF
+;; Last-Modified: 09 Jul 1992
+
+;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (defconst only-global-abbrevs nil "\
 *t means user plans to use global abbrevs only.
@@ -152,7 +156,7 @@ Does not print anything."
   (read-abbrev-file file t))
 
 (defun write-abbrev-file (file)
-  "Write all abbrev definitions to file of Lisp code.
+  "Write all abbrev definitions to a file of Lisp code.
 The file written can be loaded in another session to define the same abbrevs.
 The argument FILE is the file name to write."
   (interactive
@@ -160,7 +164,6 @@ The argument FILE is the file name to write."
     (read-file-name "Write abbrev file: "
                     (file-name-directory (expand-file-name abbrev-file-name))
                     abbrev-file-name)))
-  (interactive "FWrite abbrev file: ")
   (or (and file (> (length file) 0))
       (setq file abbrev-file-name))
   (save-excursion
diff --git a/lisp/abbrevlist.el b/lisp/abbrevlist.el
index 520ce29b201..4db719486cd 100644
--- a/lisp/abbrevlist.el
+++ b/lisp/abbrevlist.el
@@ -1,5 +1,8 @@
 ;;; abbrevlist.el --- list one abbrev table alphabetically ordered.
 
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1986, 1992 Free Software Foundation, Inc.
 ;; Suggested by a previous version by Gildea.
 
@@ -7,7 +10,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,6 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (defun list-one-abbrev-table (abbrev-table output-buffer)
   "Display alphabetical listing of ABBREV-TABLE in buffer OUTPUT-BUFFER."
diff --git a/lisp/ada.el b/lisp/ada.el
index 4588d72780e..f3746313998 100644
--- a/lisp/ada.el
+++ b/lisp/ada.el
@@ -1,8 +1,8 @@
 ;;; ada.el --- Ada editing support package in GNUlisp.  v1.0
 
-; Author: Vincent Broman <broman@bugs.nosc.mil>  May 1987.
-; (borrows heavily from Mick Jordan's Modula-2 package for GNU,
-; as modified by Peter Robinson, Michael Schmidt, and Tom Perrine.)
+;; Author: Vincent Broman <broman@bugs.nosc.mil>
+;; Last-Modified: 30 Jan 1991
+;; Keywords: languages
 
 ;; Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc.
 
@@ -10,7 +10,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -22,6 +22,14 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
+;; Created May 1987.
+;; (borrows heavily from Mick Jordan's Modula-2 package for GNU,
+;; as modified by Peter Robinson, Michael Schmidt, and Tom Perrine.)
+
+;;; Code:
+
 (setq auto-mode-alist (cons (cons "\\.ada$" 'ada-mode) auto-mode-alist))
 
 (defvar ada-mode-syntax-table nil
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 5f0eab734f1..987ef12489b 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -1,12 +1,15 @@
 ;;; apropos.el --- faster apropos commands.
 
+;; Author: Joe Wells <jbw@bigbird.bu.edu>
+;; Last-Modified: 5 May 1989
+
 ;; Copyright (C) 1989 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,10 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-;; Author: Joe Wells
-;; Last changed: Fri May  5 18:08:16 1989 by jbw (Joseph Wells) on bucsf
-;; jbw%bucsf.bu.edu@bu-it.bu.edu (school year)
-;; joew@uswest.com (summer)
+;;; Commentary:
 
 ;; The ideas for this package were derived from the C code in
 ;; src/keymap.c and elsewhere.  The functions in this file should
@@ -43,6 +43,8 @@
 ;; Made doc file buffer read-only, buried it.
 ;; Only call substitute-command-keys if do-all set.
 
+;;; Code:
+
 (defvar apropos-do-all nil
   "*Whether `apropos' and `super-apropos' should do everything that they can.
 Makes them run 2 or 3 times slower.  Set this non-nil if you have a fast
diff --git a/lisp/array.el b/lisp/array.el
index b7abdee6dd2..ad7d6c54443 100644
--- a/lisp/array.el
+++ b/lisp/array.el
@@ -1,8 +1,8 @@
 ;;; array.el --- array editing commands for Gnu Emacs
 
-;;;  Written by dmb%morgoth@harvard.harvard.edu (address is old)
-;;;   (David M. Brown at Goldberg-Zoino & Associates, Inc.)
-;;;  Thanks to cph@kleph.ai.mit.edu for assistance
+;; Author David M. Brown
+;; Maintainer: FSF
+;; Last-Modified: 30 Jan 1991
 
 ;; Copyright (C) 1987 Free Software Foundation, Inc.
 
@@ -10,7 +10,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -22,12 +22,19 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
+;;;  Written by dmb%morgoth@harvard.harvard.edu (address is old)
+;;;   (David M. Brown at Goldberg-Zoino & Associates, Inc.)
+;;;  Thanks to cph@kleph.ai.mit.edu for assistance
+
 ;;; To do:
 ;;;   Smooth initialization process by grokking local variables list
 ;;;     at end of buffer or parsing buffer using whitespace as delimiters.
 ;;;   Make 'array-copy-column-right faster.
 
 
+;;; Code:
 
 ;;; Internal information functions.
   
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index d8eba1bb0dc..ca583bb0780 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -1,12 +1,16 @@
 ;;; autoinsert.el --- automatic mode-dependent insertion of text into new files
 
+;; Author: Charlie Martin <crm@cs.duke.edu>
+;; Created: 01 Jul 1988
+;; Last-Modified: 30 Jun 1992
+
 ;; Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,7 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-;;; autoinsert.el
+;;; Commentary:
 
 ;;;  Abstract:
 ;;;
@@ -49,6 +53,8 @@
 ;;;
 ;;;  Date: Fri Jul  1 16:15:31 EDT 1988
 
+;;; Code:
+
 (defvar auto-insert-alist '(("\\.tex$" . "tex-insert.tex")
                             ("\\.c$" . "c-insert.c")
                             ("\\.h$" . "h-insert.c")
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 3f2778be604..c9339532349 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -1,12 +1,17 @@
 ;;; appt.el --- appointment notification functions.
 
+;; Author: Neil Mager <neilm@juliet.ll.mit.edu>
+;; Version: 2.1
+;; Last-Modified: 14 Jul 1992
+;; Keywords: calendar
+
 ;; Copyright (C) 1989, 1990 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,12 +23,13 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
 ;;
 ;; appt.el - visible and/or audible notification of
 ;;           appointments from ~/diary file generated from
 ;;           Edward M. Reingold's calendar.el.
 ;;
-;; Version 2.1
 ;;
 ;; Comments, corrections, and improvements should be sent to
 ;; Neil M. Mager
@@ -99,6 +105,9 @@
 ;;; reads. This is all done automatically.
 ;;; It is invoked from the function list-diary-entries.
 ;;;
+
+;;; Code:
+
 (defvar appt-issue-message t
   "*Non-nil means check for appointments in the diary buffer.
 To be detected, the diary entry must have the time
diff --git a/lisp/case-table.el b/lisp/case-table.el
index bdc109675ba..407c63ed14c 100644
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -1,4 +1,8 @@
-;;; case-table.el --- functions for extending the character set and dealing with case tables.
+;;; case-table.el ---code to extend the character set and support case tables.
+
+;; Author: Howard Gayle
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
 
 ;; Copyright (C) 1988 Free Software Foundation, Inc.
 
@@ -6,7 +10,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
 
 ;; Written by:
 ;; TN/ETX/TX/UMG Howard Gayle        UUCP : seismo!enea!erix!howard
@@ -26,6 +31,8 @@
 ;; S-126 25 Stockholm                FAX  : +46 8 719 64 82
 ;; Sweden
 
+;;; Code:
+
 (defun describe-buffer-case-table ()
   "Describe the case table of the current buffer."
   (interactive)
diff --git a/lisp/chistory.el b/lisp/chistory.el
index 620288fc77a..e6871f53e49 100644
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -1,13 +1,16 @@
 ;;; chistory.el --- list command history
 
+;; Author: K. Shane Hartman
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
-;; Principal author K. Shane Hartman
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,12 +22,15 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
 
 ;; This really has nothing to do with list-command-history per se, but
 ;; its a nice alternative to C-x ESC (repeat-complex-command) and
 ;; functions as a lister if given no pattern.  It's not important
 ;; enough to warrant a file of its own.
 
+;;; Code:
+
 ;;;###autoload
 (defun repeat-matching-complex-command (&optional pattern)
   "Edit and re-evaluate complex command with name matching PATTERN.
diff --git a/lisp/comint.el b/lisp/comint.el
index 24ba4459246..b4686ac42a4 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1,12 +1,16 @@
 ;;; comint.el --- general command interpreter in a window stuff
 
+;; Maintainer: Olin Shivers <shivers@cs.cmu.edu>
+;; Last-Modified: 16 Jul 1992
+;; Version: 2.03
+
 ;;; Copyright Olin Shivers (1988).
 
 ;;; 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
-;;; the Free Software Foundation; either version 1, or (at your option)
+;;; the Free Software Foundation; either version 2, or (at your option)
 ;;; any later version.
 
 ;;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +22,8 @@
 ;;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
 ;;; The changelog is at the end of this file.
 
 ;;; Please send me bug reports, bug fixes, and extensions, so that I can
@@ -57,8 +63,6 @@
 ;;; background, dbx, gdb, kermit, prolog, telnet) to use comint-mode
 ;;; instead of shell-mode, see the notes at the end of this file.
 
-(defconst comint-version "2.03")
-
 
 ;;; Brief Command Documentation:
 ;;;============================================================================
@@ -101,6 +105,10 @@
 ;;; comint-mode-hook is the comint mode hook. Basically for your keybindings.
 ;;; comint-load-hook is run after loading in this package.
 
+;;; Code:
+
+(defconst comint-version "2.03")
+
 
 ;;; Buffer Local Variables:
 ;;;============================================================================
diff --git a/lisp/compare-w.el b/lisp/compare-w.el
index b4f4e6f383f..f244e1d1f7c 100644
--- a/lisp/compare-w.el
+++ b/lisp/compare-w.el
@@ -1,12 +1,15 @@
 ;;; compare-w.el --- compare text between windows for Emacs.
 
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1986, 1989 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 (defvar compare-windows-whitespace " \t\n"
   "*String of characters considered whitespace for \\[compare-windows].
 Changes in whitespace are optionally ignored.
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 218e7c02460..476a36b37fb 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -1,12 +1,15 @@
 ;;; dabbrev.el --- dynamic abbreviation package for GNU Emacs.
 
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
 
 ; DABBREVS - "Dynamic abbreviations" hack, originally written by Don Morrison
 ; for Twenex Emacs.  Converted to mlisp by Russ Fish.  Supports the table
@@ -30,10 +34,12 @@
 ;  
 ; If anyone feels like hacking at it, Bob Keller (Keller@Utah-20) first
 ; suggested the beast, and has some good ideas for its improvement, but
-; doesn?tknow TECO (the lucky devil...).  One thing that should definitely
+; doesn't know TECO (the lucky devil...).  One thing that should definitely
 ; be done is adding the ability to search some other buffer(s) if you can?t
 ; find the expansion you want in the current one.
 
+;;; Code:
+
 ;; (defun dabbrevs-help ()
 ;;   "Give help about dabbrevs."
 ;;   (interactive)
diff --git a/lisp/diff.el b/lisp/diff.el
index 7a0dd95387c..aa0551cef08 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -1,13 +1,17 @@
 ;;; diff.el --- "DIFF" mode for handling output from unix diff utility.
 
+;; Author: Frank P. Bresz <fpb@ittc.wec.com>
+;; Maintainer: FSF
+;; Created: 27 Jan 1989
+;; Last-Modified: 21 Dec 1992
+
 ;; Copyright (C) 1990 Free Software Foundation, Inc.
-;; Written fpb@ittc.wec.com 1/27/89
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,6 +23,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
 ;; todo: diff-switches flexibility:
 ;; (defconst diff-switches-function
 ;;   '(lambda (file)
@@ -36,7 +42,8 @@
 ;; search for the pattern.  If you only 1 addition you won't find the end
 ;; of the pattern (minor)
 
-;;
+;;; Code:
+
 (defvar diff-switches nil
   "*A list of switches to pass to the diff program.")
 
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 98f8a0dde37..04e9af44c59 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1,15 +1,16 @@
 ;; dired-aux.el --- directory browsing command support
-;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc.
 
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>.
 ;; Version: 5.234
 ;; Last-Modified: 14 Jul 1992
 
+;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc.
+
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -1779,4 +1780,4 @@ Use \\[dired-hide-subdir] to (un)hide a particular subdirectory."
 
 ;;;###end dired-ins.el
 
-;;; dired-aux.el ends here
\ No newline at end of file
+;;; dired-aux.el ends here
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 9b275cbca0f..88366207a5e 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -1,12 +1,16 @@
 ;;; disp-table.el --- functions for dealing with char tables.
 
+;; Author: Howard Gayle
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1987 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,8 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-
-;; Written by Howard Gayle.
+;;; Code:
 
 (defun rope-to-vector (rope)
   (let* ((len (/ (length rope) 2))
diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el
index 88e50a9799e..d9f1525d645 100644
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -1,9 +1,7 @@
 ;;; ebuff-menu.el --- electric-buffer-list mode
 
-; buggestions to mly@ai.mit.edu
-
-;; who says one can't have typeout windows in gnu emacs?
-;; like ^r select buffer from its emacs lunar or tmacs libraries.
+;; Author: Richard Mlynarik <mly@ai.mit.edu>
+;; Last-Modified: 21 Dec 1991
 
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
@@ -11,7 +9,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -23,6 +21,12 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
+;; who says one can't have typeout windows in gnu emacs?
+;; like ^r select buffer from its emacs lunar or tmacs libraries.
+
+;;; Code:
 
 (require 'electric)
 
diff --git a/lisp/echistory.el b/lisp/echistory.el
index 59e51cddf6a..d3d495456a8 100644
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -1,13 +1,16 @@
 ;;; echistory.el --- Electric Command History Mode
 
+;; Author: K. Shane Hartman
+;; Maintainer: FSF
+;; Last-Modified: 09 May 1991
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
-;; Principal author K. Shane Hartman
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,6 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (require 'electric)                     ; command loop
 (require 'chistory)                     ; history lister
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index 05ee0912a2c..4d92b45b89f 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -1,4 +1,9 @@
-;;; edmacro.el --- keyboard macro editor for GNU Emacs.  Version 1.02.
+;;; edmacro.el --- keyboard macro editor
+
+;; Author: Dave Gillespie <daveg@csvax.caltech.edu>
+;; Maintainer: FSF
+;; Version: 1.02
+;; Last-Modified: 09 May 1991
 
 ;; Copyright (C) 1990 Free Software Foundation, Inc.
 
@@ -6,7 +11,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,13 +23,15 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-;; Original from: Dave Gillespie, daveg@csvax.caltech.edu.
+;;; Commentary:
 
 ;; To use, type `M-x edit-last-kbd-macro' to edit the most recently
 ;; defined keyboard macro.  If you have used `M-x name-last-kbd-macro'
 ;; to give a keyboard macro a name, type `M-x edit-kbd-macro' to edit
 ;; the macro by name.  When you are done editing, type `C-c C-c' to
 ;; record your changes back into the original keyboard macro.
+
+;;; Code:
 
 ;;; The user-level commands for editing macros.
 
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index 94eadfadbd3..713a8984acd 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -1,12 +1,15 @@
 ;;; ehelp.el --- bindings for electric-help mode
 
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1986 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 (require 'electric)
 (defvar electric-help-map ()
   "Keymap defining commands available in `electric-help-mode'.")
diff --git a/lisp/electric.el b/lisp/electric.el
index b42eb47ed0e..cce4b101304 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -1,13 +1,16 @@
 ;;; electric.el --- window maker and Command loop for `electric' modes.
 
+;; Author: K. Shane Hartman
+;; Maintainer: FSF
+;; Last-Modified: 09 Jun 1992
+
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-;; Principal author K. Shane Hartman
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index c6916a3dd56..cdc5785c35e 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -1,11 +1,13 @@
 ;;; autoload.el --- maintain autoloads in loaddefs.el.
 
+;; Author: Roland McGrath <roland@gnu.ai.mit.edu>
+;; Last-Modified: 24 Jun 1992
+
 ;;; Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-;;; Written by Roland McGrath.
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 1, or (at your option)
+;;; the Free Software Foundation; either version 2, or (at your option)
 ;;; any later version.
 ;;;
 ;;; This program is distributed in the hope that it will be useful,
@@ -19,6 +21,8 @@
 ;;; 02139, USA.
 ;;;
 
+;;; Code:
+
 (defun make-autoload (form file)
   "Turn FORM, a defun or defmacro, into an autoload for source file FILE.
 Returns nil if FORM is not a defun or defmacro."
diff --git a/lisp/emacs-lisp/backquote.el b/lisp/emacs-lisp/backquote.el
index 9a4d7d5ffd7..bff397e3d74 100644
--- a/lisp/emacs-lisp/backquote.el
+++ b/lisp/emacs-lisp/backquote.el
@@ -1,13 +1,15 @@
 ;; backquote.el --- backquoting for Emacs Lisp macros
 
+;; Author: Dick King (king@kestrel).
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
-;; Written by Dick King (king@kestrel).
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,8 +21,9 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
 
-;;; This is a rudimentry backquote package written by D. King,
+ ;;; This is a rudimentry backquote package written by D. King,
  ;;; king@kestrel, on 8/31/85.  (` x) is a macro
  ;;; that expands to a form that produces x.  (` (a b ..)) is
  ;;; a macro that expands into a form that produces a list of what a b
@@ -58,6 +61,7 @@
  ;;; This is so crunchy that I am considering including a check for
  ;;; this or changing the syntax to ... ,(<form>).  RMS: opinion?
 
+;;; Code:
 
 ;;; a raft of general-purpose macros follows.  See the nearest
  ;;; Commonlisp manual.
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 92f20f7cc4f..d27e29d7e07 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -1,5 +1,9 @@
 ;;; cl-indent.el --- enhanced lisp-indent mode
 
+;; Author: Richard Mlynark <mly@eddie.mit.edu>
+;; Maintainer: FSF
+;; Last-Modified: 09 May 1991
+
 ;; Copyright (C) 1987 Free Software Foundation, Inc.
 ;; Written by Richard Mlynarik July 1987
 
@@ -7,7 +11,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,6 +23,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
 ;;>> TODO
 ;; :foo
 ;;   bar
@@ -33,6 +39,7 @@
 ;;              baz)
 ;;  Need something better than &rest for such cases
 
+;;; Code:
 
 ;;; Hairy lisp indentation.
 
diff --git a/lisp/emacs-lisp/cust-print.el b/lisp/emacs-lisp/cust-print.el
index 444cc29f913..767119fa9c4 100644
--- a/lisp/emacs-lisp/cust-print.el
+++ b/lisp/emacs-lisp/cust-print.el
@@ -1,9 +1,9 @@
 ;; cus-print.el -- handles print-level and print-circle.
 
-;; LCD Archive Entry:
-;; custom-print|Daniel LaLiberte|liberte@cs.uiuc.edu
-;; |Handle print-level, print-circle and more.
-;; |$Date: Tue Mar 17, 1992$|$Revision: 1.0$|
+;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
+;; Version: 1.0
+;; Last-Modified: 17 Mar 1992
+;; Adapted-By: ESR
 
 ;; Copyright (C) 1992 Free Software Foundation, Inc.
 
@@ -11,7 +11,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -23,6 +23,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
 ;; This package provides a general print handler for prin1 and princ
 ;; that supports print-level and print-circle, and by the way,
 ;; print-length since the standard routines are being replaced.  Also,
@@ -88,6 +90,7 @@
 ;; custom-message
 ;; custom-error
 
+;;; Code:
 
 (provide 'custom-print)
 ;; Abbreviated package name: "CP"
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 9faf131dd26..f3378c5f01d 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -1,12 +1,15 @@
 ;;; debug.el --- debuggers and related commands for Emacs
 
+;; Maintainer: FSF
+;; Last-Modified: 08 Jan 1992
+
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (defvar debug-function-list nil
   "List of functions currently set for debug on entry.")
diff --git a/lisp/emacs-lisp/float.el b/lisp/emacs-lisp/float.el
index d01ba1e291d..85d9b4db78c 100644
--- a/lisp/emacs-lisp/float.el
+++ b/lisp/emacs-lisp/float.el
@@ -1,13 +1,16 @@
 ;;; float.el --- floating point arithmetic package.
 
+;; Author: Bill Rosenblatt
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1986 Free Software Foundation, Inc.
-;; Author Bill Rosenblatt
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,6 +22,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
 ;; Floating point numbers are represented by dot-pairs (mant . exp)
 ;; where mant is the 24-bit signed integral mantissa and exp is the
 ;; base 2 exponent.
@@ -46,6 +51,8 @@
 ;; June 20, 1986
 ;;
 
+;;; Code:
+
 ;; fundamental implementation constants
 (defconst exp-base 2
   "Base of exponent in this floating point representation.")
diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el
index e3565856f56..cf9b2899319 100644
--- a/lisp/emacs-lisp/helper.el
+++ b/lisp/emacs-lisp/helper.el
@@ -1,13 +1,16 @@
 ;;; helper.el --- utility help package supporting help in electric modes
 
+;; Author: K. Shane Hartman
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1991
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
-;; Principal author K. Shane Hartman
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,6 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ; hey, here's a helping hand.
 
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index d3c1c519460..9314d0b51fb 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -1,12 +1,15 @@
 ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands.
 
+;; Maintainer: FSF
+;; Last-Modified: 03 Jun 1992
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index cc3b189ea3d..feedaa56077 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -1,12 +1,15 @@
 ;;; lisp.el --- Lisp editing commands for Emacs
 
+;; Maintainer: FSF
+;; Last-Modified: 12 Mar 1992
+
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (defvar defun-prompt-regexp nil
   "Non-nil => regexp to ignore, before the `(' that starts a defun.")
diff --git a/lisp/emacs-lisp/profile.el b/lisp/emacs-lisp/profile.el
index dfd853fcb32..27757ce0b1d 100644
--- a/lisp/emacs-lisp/profile.el
+++ b/lisp/emacs-lisp/profile.el
@@ -1,8 +1,8 @@
 ;;; profile.el -- generate run time measurements of Emacs Lisp functions
 
 ;; Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
-;; Created: 7 Feb 1992
-;; Last-Modified: 7 Feb 1992
+;; Created: 07 Feb 1992
+;; Last-Modified: 07 Feb 1992
 ;; Version: 1.0
 ;; Adapted-By: ESR
 
@@ -12,7 +12,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index 589f7418bf6..15a45251f53 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -1,5 +1,10 @@
 ;;; edt.el --- EDT emulation in Emacs
 
+;; Author: Mike Clarkson <mike@yetti.UUCP>
+;; Maintainer: FSF
+;; Created: 27 Aug 1986
+;; Last-Modified: 09 May 1991
+
 ;; Copyright (C) 1986 Free Software Foundation, Inc.
 ;;  It started from public domain code by Mike Clarkson
 ;;  but has been greatly altered.
@@ -8,7 +13,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -20,25 +25,13 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-;; From mike@yetti.UUCP Fri Aug 29 12:49:28 1986
-;; Path: yetti!mike@uunet.uu.net
-;; From: mike@yetti.UUCP (Mike Clarkson )
-;; Newsgroups: net.sources
-;; Subject: Gnu Emacs EDT Emulation - Introduction - 1/3
-;; Date: 27 Aug 86 23:30:33 GMT
-;; Reply-To: mike@yetti.UUCP (Mike Clarkson )
-;; Organization: York University Computer Science
-;; 
+;;; Commentary:
+
 ;; Here's my EDT emulation for GNU Emacs that is based on the EDT emulation
 ;; for Gosling's Emacs sent out on the net a couple of years ago by Lynn Olson
 ;; at Tektronics.  This emulation was widely distributed as the file edt.ml
 ;; in the maclib directory of most Emacs distributions.
 ;;      
-;; My emulation consists of two files: edt.el and edtdoc.el.  The edtdoc.el
-;; file is the documentation, that you can add to the beginning of edt.el if
-;; you want.  I have split them because I have been loading the edt.el file a
-;; lot during debugging.
-;;      
 ;; I will gladly take all criticisms and complaints to heart, and will fix what
 ;; bugs I can find.  As this is my first Emacs Lisp hack, you may have to root
 ;; out a few nasties hidden in the code.  Please let me know if you find any
@@ -120,12 +113,8 @@
 ;; UUCP.  If you have a UUCP or BITNET address please use it for communication
 ;; so that I can reach you directly.  If you have both, the BITNET address
 ;; is preferred.
-;; -- 
-;; Mike Clarkson,                 ...!allegra \         BITNET: mike@YUYETTI or
-;; CRESS, York University,        ...!decvax   \                SYMALG@YUSOL
-;; 4700 Keele Street,     ...!ihnp4     > !utzoo!yetti!mike
-;; North York, Ontario,   ...!linus    /                     
-;; CANADA M3J 1P3.                ...!watmath / Phone: +1 (416) 737-2100 x 7767
+
+;;; Code:
 
 (require 'keypad)
 
diff --git a/lisp/emulation/mlconvert.el b/lisp/emulation/mlconvert.el
index ec6d93eb4a1..e1609a8748c 100644
--- a/lisp/emulation/mlconvert.el
+++ b/lisp/emulation/mlconvert.el
@@ -1,12 +1,15 @@
 ;;; mlconvert.el --- convert buffer of Mocklisp code to real lisp.
 
+;; Maintainer: FSF
+;; Last-Modified: 09 May 1991
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 ;;;###autoload
 (defun convert-mocklisp-buffer ()
   "Convert buffer of Mocklisp code to real Lisp that GNU Emacs can run."
diff --git a/lisp/emulation/mlsupport.el b/lisp/emulation/mlsupport.el
index 65af46a309e..7023662e764 100644
--- a/lisp/emulation/mlsupport.el
+++ b/lisp/emulation/mlsupport.el
@@ -1,12 +1,15 @@
 ;;; mlsupport.el --- run-time support for mocklisp code.
 
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (defmacro ml-defun (&rest defs)
   (list 'ml-defun-1 (list 'quote defs)))
diff --git a/lisp/env.el b/lisp/env.el
index d80338a00aa..e03c38be1a7 100644
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -1,12 +1,15 @@
 ;;; setenv.el --- functions to manipulate environment variables.
 
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
+
 ;;; Copyright Free Software Foundation 1991
 
 ;;; 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
-;;; the Free Software Foundation; either version 1, or (at your option)
+;;; the Free Software Foundation; either version 2, or (at your option)
 ;;; any later version.
 
 ;;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,8 @@
 ;;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 (defun setenv (variable value)
   "Set the value of the environment variable named VARIABLE to VALUE.
 VARIABLE and VALUE should both be strings.
diff --git a/lisp/files.el b/lisp/files.el
index 21f0bd1c4ca..6e68c137f77 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1,12 +1,15 @@
 ;;; files.el --- file input and output commands for Emacs
 
+;; Maintainer: FSF
+;; Last-Modified: 09 Jul 92
+
 ;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 (defconst delete-auto-save-files t
   "*Non-nil means delete a buffer's auto-save file when the buffer is saved.")
 
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index ab5e3c43ef3..be7b0eaf662 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -1,13 +1,18 @@
 ;; find-dired.el --- run a `find' command and dired the output
 
-;;; Copyright (C) 1991 Roland McGrath
+;; Author: Roland McGrath <roland@gnu.ai.mit.edu>
+;;      Sebastian Kremer <sk@thp.uni-koeln.de>
+;; Maintainer: Roland McGrath <roland@gnu.ai.mit.edu>
+;; Last-Modified: 16 Mar 1992
 
 (defconst find-dired-version (substring "$Revision: 1.9 $" 11 -2)
   "$Id: find-dired.el,v 1.9 1991/11/11 13:24:31 sk Exp $")
 
+;;; Copyright (C) 1991 Roland McGrath
+
 ;;; This program is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 1, or (at your option)
+;;; the Free Software Foundation; either version 2, or (at your option)
 ;;; any later version.
 ;;;
 ;;; This program is distributed in the hope that it will be useful,
@@ -19,13 +24,8 @@
 ;;; program's author (send electronic mail to roland@ai.mit.edu) or from
 ;;; the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA
 ;;; 02139, USA.
-;;;
-;; LISPDIR ENTRY for the Elisp Archive ===============================
-;;    LCD Archive Entry:
-;;    find-dired|Roland McGrath, Sebastian Kremer
-;;    |roland@gnu.ai.mit.edu, sk@thp.uni-koeln.de
-;;    |Run a `find' command and dired the output
-;;    |$Date: 1991/11/11 13:24:31 $|$Revision: 1.9 $|
+
+;;; Commentary:
 
 ;; INSTALLATION ======================================================
 
@@ -46,6 +46,8 @@
 ;;
 ;; in your ~/.emacs.
 
+;;; Code:
+
 (require 'dired)
 ;;;###autoload
 (defvar find-ls-option (if (eq system-type 'berkeley-unix) "-ls"
diff --git a/lisp/find-gc.el b/lisp/find-gc.el
index 1e02e65c1d0..3523f9ca4e2 100644
--- a/lisp/find-gc.el
+++ b/lisp/find-gc.el
@@ -1,12 +1,15 @@
 ;;; find-gc.el --- detect functions that call the garbage collector
 
+;; Maintainer: FSF
+;; Last-Modified: 21 Nov 1990
+
 ;; Copyright (C) 1992 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;; Code:
+
 ;;; Produce in unsafe-list the set of all functions that may invoke GC.
 ;;; This expects the Emacs sources to live in emacs-source-directory.
 ;;; It creates a temporary working directory /tmp/esrc.
diff --git a/lisp/float-sup.el b/lisp/float-sup.el
index f52832fb3a1..e4cb195fbc8 100644
--- a/lisp/float-sup.el
+++ b/lisp/float-sup.el
@@ -1,12 +1,15 @@
 ;;; float-sup.el --- detect absence of floating-point support in Emacs runtime
 
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 ;; Provide a meaningful error message if we are running on
 ;; bare (non-float) emacs.
 ;; Can't test for 'floatp since that may be defined by float-imitation
diff --git a/lisp/ftp.el b/lisp/ftp.el
index fec6a493484..2d051e1195f 100644
--- a/lisp/ftp.el
+++ b/lisp/ftp.el
@@ -9,7 +9,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -21,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 ;; Prevent changes in major modes from altering these variables.
 (put 'ftp-temp-file-name 'permanent-local t)
 (put 'ftp-file 'permanent-local t)
diff --git a/lisp/gnus.el b/lisp/gnus.el
index 17a0c2d206a..ea56efd1b73 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1,13 +1,17 @@
 ;;; gnus.el --- GNUS: an NNTP-based News Reader for GNU Emacs
 
-;; Copyright (C) 1987, 1988, 1989, 1990 Free Software Foundation, Inc.
+;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
+;; Last-Modified: 10 Jun 1992
+
 ;; $Header: gnus.el,v 3.13 90/03/23 13:24:27 umerin Locked $
 
+;; Copyright (C) 1987, 1988, 1989, 1990 Free Software Foundation, Inc.
+
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,6 +23,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
 ;; GNUS Mailing List:
 ;; There are two mailing lists for GNUS lovers in the world:
 ;;
@@ -47,6 +53,8 @@
 ;; (3) Multi-GNUS (Talking to many hosts same time).
 ;; (4) Asynchronous transmission of large messages.
 
+;;; Code:
+
 (require 'nntp)
 (require 'mail-utils)
 
diff --git a/lisp/gnusmail.el b/lisp/gnusmail.el
index 73f58b4317c..049cd47c626 100644
--- a/lisp/gnusmail.el
+++ b/lisp/gnusmail.el
@@ -1,13 +1,17 @@
 ;;; gnusmail.el --- mail reply commands for GNUS newsreader
 
-;; Copyright (C) 1990 Free Software Foundation, Inc.
+;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
+;; Last-Modified: 10 Jun 1992
+
 ;; $Header: gnusmail.el,v 1.1 90/03/23 13:24:39 umerin Locked $
 
+;; Copyright (C) 1990 Free Software Foundation, Inc.
+
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,7 +23,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-(require 'gnus)
+;;; Commentary:
 
 ;; Provides mail reply and mail other window command using usual mail
 ;; interface and mh-e interface.
@@ -32,6 +36,10 @@
 ;; gnus-mail-other-window-method to gnus-mail-reply-using-mhe and
 ;; gnus-mail-other-window-using-mhe, respectively.
 
+;;; Code:
+
+(require 'gnus)
+
 (autoload 'news-mail-reply "rnewspost")
 (autoload 'news-mail-other-window "rnewspost")
 
diff --git a/lisp/gnusmisc.el b/lisp/gnusmisc.el
index a1c269a6197..8d1b0e37820 100644
--- a/lisp/gnusmisc.el
+++ b/lisp/gnusmisc.el
@@ -1,13 +1,17 @@
 ;;; gnusmisc.el --- miscellaneous commands for GNUS newsreader
 
-;; Copyright (C) 1989, 1990 Free Software Foundation, Inc.
+;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
+;; Last-Modified: 10 Jun 1992
+
 ;; $Header: gnusmisc.el,v 1.2 90/03/23 13:25:04 umerin Locked $
 
+;; Copyright (C) 1989, 1990 Free Software Foundation, Inc.
+
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,6 +23,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 (require 'gnus)
 
 ;;;
diff --git a/lisp/gnuspost.el b/lisp/gnuspost.el
index d7eecf2242e..b5becd39fca 100644
--- a/lisp/gnuspost.el
+++ b/lisp/gnuspost.el
@@ -1,13 +1,17 @@
 ;;; gnuspost.el --- post news commands for GNUS newsreader
 
-;; Copyright (C) 1989, 1990 Free Software Foundation, Inc.
+;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
+;; Last-Modified: 10 Jun 1992
+
 ;; $Header: gnuspost.el,v 1.2 90/03/23 13:25:16 umerin Locked $
 
+;; Copyright (C) 1989, 1990 Free Software Foundation, Inc.
+
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,6 +23,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 (require 'gnus)
 
 (defvar gnus-organization-file "/usr/lib/news/organization"
diff --git a/lisp/gosmacs.el b/lisp/gosmacs.el
index 7246959f3a5..5791956bb61 100644
--- a/lisp/gosmacs.el
+++ b/lisp/gosmacs.el
@@ -1,12 +1,15 @@
 ;;; gosmacs.el --- rebindings to imitate Gosmacs.
 
+;; Maintainer: FSF
+;; Last-Modified: 09 May 1991
+
 ;; Copyright (C) 1986 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (defvar non-gosmacs-binding-alist nil)
 
diff --git a/lisp/grow-vers.el b/lisp/grow-vers.el
index 7e34961faaa..ceea85d9a06 100644
--- a/lisp/grow-vers.el
+++ b/lisp/grow-vers.el
@@ -1,14 +1,15 @@
 ;;; grow-vers.el --- increment Emacs version number
 
-;; Load this file to add a new level (starting at zero)
-;; to the Emacs version number recorded in version.el.
+;; Maintainer: FSF
+;; Last-Modified: 31 Oct 1989
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -20,6 +21,12 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
+;; Load this file to add a new level (starting at zero)
+;; to the Emacs version number recorded in version.el.
+
+;;; Code:
 
 (insert-file-contents "lisp/version.el")
 
diff --git a/lisp/help.el b/lisp/help.el
index 270934d989b..6c4c33e40fa 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1,12 +1,15 @@
 ;;; help.el --- help commands for Emacs
 
+;; Maintainer: FSF
+;; Last-Modified: 30 Jun 1992
+
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 (defvar help-map (make-sparse-keymap)
   "Keymap for characters following the Help key.")
 
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 4656a9e7c0c..56c94d8e372 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -1,4 +1,7 @@
-;;; hexl-mode.el --- edit a file in a hex dump format.
+;;; hexl-mode.el --- edit a file in a hex dump format using the hexl filter.
+
+;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu>
+;; Last-Modified: 06 Mar 1991
 
 ;; Copyright (C) 1989 Free Software Foundation, Inc.
 
@@ -6,7 +9,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,9 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-;;
-;; By: Keith Gabryelski (ag@wheaties.ai.mit.edu)
-;;
+;;; Commentary:
+
 ;; This may be useful in your .emacs:
 ;;
 ;;      (autoload 'hexl-find-file "hexl"
@@ -37,6 +39,8 @@
 ;; ASCII region of the screen (if your emacs supports this) instead of
 ;; changing them to dots.
 
+;;; Code:
+
 ;;
 ;; vars here
 ;;
diff --git a/lisp/inc-vers.el b/lisp/inc-vers.el
index 1eed7b35940..0260dfa5232 100644
--- a/lisp/inc-vers.el
+++ b/lisp/inc-vers.el
@@ -1,12 +1,15 @@
 ;;; inc-vers.el --- load this to increment the recorded Emacs version number.
 
+;; Maintainer: FSF
+;; Last-Modified: 31 Oct 1989
+
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (insert-file-contents "../lisp/version.el")
 
diff --git a/lisp/indent.el b/lisp/indent.el
index 2990a5ae2df..3f5d5fe8156 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -1,12 +1,15 @@
 ;;; indent.el --- indentation commands for Emacs
 
+;; Maintainer: FSF
+;; Last-Modified: 09 Jul 1992
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (defvar indent-line-function 'indent-to-left-margin "\
 Function to indent current line.");Now in loaddefs.el
diff --git a/lisp/info.el b/lisp/info.el
index 58eccfc8392..abf05ea71ff 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1,12 +1,15 @@
 ;;; info.el --- info package for Emacs.
-;;; Note that nowadays we expect info files to be made using makeinfo.
+
+;; Maintainer: FSF
+;; Last-Modified: 30 Jun 1992
+
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,12 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
+;;; Note that nowadays we expect info files to be made using makeinfo.
+
+;;; Code:
+
 (defvar Info-history nil
   "List of info nodes user has visited.
 Each element of list is a list (FILENAME NODENAME BUFFERPOS).")
diff --git a/lisp/informat.el b/lisp/informat.el
index 939b1cbb632..af970512ee6 100644
--- a/lisp/informat.el
+++ b/lisp/informat.el
@@ -1,12 +1,15 @@
 ;;; informat.el --- info support functions package for Emacs
 
+;; Maintainer: FSF
+;; Last-Modified: 09 May 1991
+
 ;; Copyright (C) 1986 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 (require 'info)
 
 ;;;###autoload
diff --git a/lisp/international/iso-ascii.el b/lisp/international/iso-ascii.el
index b90d5aa47c0..2a7417d7cd0 100644
--- a/lisp/international/iso-ascii.el
+++ b/lisp/international/iso-ascii.el
@@ -1,4 +1,8 @@
-;;; iso-ascii.el --- set up char tables for ISO 8859/1 character set for ASCII terminals.
+;;; iso-ascii.el --- set up char tables for ISO 8859/1 on ASCII terminals.
+
+;; Author: Howard Gayle
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
 
 ;; Copyright (C) 1987 Free Software Foundation, Inc.
 
@@ -6,7 +10,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
 
 ;; Written by Howard Gayle.  See display-table.el for details.
 
@@ -25,6 +30,8 @@
 ;; ASCII terminals.  The display strings for the characters are
 ;; more-or-less based on TeX.
 
+;;; Code:
+
 (require 'disp-table)
 
 (standard-display-ascii 160 "{_}")   ; NBSP (no-break space)
diff --git a/lisp/international/iso-insert.el b/lisp/international/iso-insert.el
index 84f19858735..be653bed52f 100644
--- a/lisp/international/iso-insert.el
+++ b/lisp/international/iso-insert.el
@@ -1,12 +1,16 @@
 ;;; iso-insert.el --- insert functions for ISO 8859/1.
 
+;; Author: Howard Gayle
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1987 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ;; Written by Howard Gayle.  See case-table.el for details.
 
diff --git a/lisp/international/iso-swed.el b/lisp/international/iso-swed.el
index 0e8caf49ed0..7d16f1d9a12 100644
--- a/lisp/international/iso-swed.el
+++ b/lisp/international/iso-swed.el
@@ -1,4 +1,8 @@
-;;; iso-swed.el --- set up char tables for ISO 8859/1 for Swedish/Finnish terminals.
+;;; iso-swed.el --- set up char tables for ISO 8859/1 for Swedish/Finnish ttys
+
+;; Author: Howard Gayle
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
 
 ;; Copyright (C) 1987 Free Software Foundation, Inc.
 
@@ -6,7 +10,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ;; Written by Howard Gayle.  See case-table.el for details.
 
diff --git a/lisp/international/swedish.el b/lisp/international/swedish.el
index 46465167d09..865a6f16edd 100644
--- a/lisp/international/swedish.el
+++ b/lisp/international/swedish.el
@@ -1,12 +1,15 @@
 ;;; swedish.el --- miscellaneous functions for dealing with Swedish.
 
+;; Author: Howard Gayle
+;; Maintainer: FSF
+
 ;; Copyright (C) 1988 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ;; Written by Howard Gayle.  See case-table.el for details.
 
diff --git a/lisp/isearch-old.el b/lisp/isearch-old.el
index 1661979e5f1..570ddc1c973 100644
--- a/lisp/isearch-old.el
+++ b/lisp/isearch-old.el
@@ -1,12 +1,15 @@
 ;;; isearch.el --- incremental search commands
 
+;; Maintainer: FSF
+;; Last-Modified: 30 Jun 1992
+
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 (defvar search-last-string "" "\
 Last string search for by a non-regexp search command.
 This does not include direct calls to the primitive search functions,
diff --git a/lisp/iso8859-1.el b/lisp/iso8859-1.el
index a91546ebd96..3939bcab6a2 100644
--- a/lisp/iso8859-1.el
+++ b/lisp/iso8859-1.el
@@ -1,11 +1,16 @@
-;; Set up case-conversion and syntax tables for ISO 8859/1 character set.
+;; iso8859-1.el --- set up case-conversion and syntax tables for ISO 8859/1
+
+;; Author: Howard Gayle
+;; Maintainer: FSF
+;; Last-Modified: 24 Jun 1992
+
 ;; Copyright (C) 1988 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -17,6 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ;; Written by Howard Gayle.  See case-table.el for details.
 
diff --git a/lisp/kermit.el b/lisp/kermit.el
index 883ed787bd1..75e5f3ff227 100644
--- a/lisp/kermit.el
+++ b/lisp/kermit.el
@@ -10,7 +10,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -73,6 +73,8 @@
 ;; Please let me know if any bugs turn up.
 ;; Feb 1988, Jeff Norden - jeff@colgate.csnet
 
+;;; Code:
+
 (require 'shell)
 
 (defvar kermit-esc-char "\C-\\" "*Kermit's escape char")
diff --git a/lisp/ledit.el b/lisp/ledit.el
index 90347323056..1f8667bd268 100644
--- a/lisp/ledit.el
+++ b/lisp/ledit.el
@@ -1,12 +1,15 @@
 ;;; ledit.el --- Emacs side of ledit interface
 
+;; Maintainer: FSF
+;; Last-Modified: 13 May 1991
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ;;; To do:
 ;;; o lisp -> emacs side of things (grind-definition and find-definition)
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 24b09eb6bcf..81123a297ea 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -1,5 +1,8 @@
 ;;; loadup.el --- load up standardly loaded Lisp files for Emacs.
 
+;; Maintainer: FSF
+;; Last-Modified: 14 Jul 1992
+
 ;; This is loaded into a bare Emacs to make a dumpable one.
 ;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc.
 
@@ -7,7 +10,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,6 +22,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 ;;; We don't want to have any undo records in the dumped Emacs.
 (buffer-disable-undo "*scratch*")
 
diff --git a/lisp/lpr.el b/lisp/lpr.el
index e7d182fede8..d6b3723f2a5 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -1,12 +1,15 @@
 ;;; lpr.el --- print Emacs buffer on line printer.
 
+;; Maintainer: FSF
+;; Last-Modified: 19 Apr 1992
+
 ;; Copyright (C) 1985, 1988, 1992 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ;;;###autoload
 (defconst lpr-switches nil "\
diff --git a/lisp/macros.el b/lisp/macros.el
index 4cd6a34ebe8..74fdff6f7f0 100644
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -1,12 +1,15 @@
 ;;; macros.el --- non-primitive commands for keyboard macros.
 
+;; Maintainer: FSF
+;; Last-Modified: 05 Nov 1991
+
 ;; Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ;;;###autoload
 (defun name-last-kbd-macro (symbol)
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index aff48f1a45c..a450af90a84 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -1,17 +1,17 @@
 ;;; emacsbug.el --- command to report Emacs bugs to appropriate mailing list.
 
+;; Author: K. Shane Hartman
 ;; Maintainer: FSF
 ;; Last-Modified: 21 Dec 1991
 
 ;; Not fully installed because it can work only on Internet hosts.
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
-;; Principal author K. Shane Hartman
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index a7d9ef9c3b3..dbed4b708b6 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -1,12 +1,15 @@
 ;;; mail-utils.el --- utility functions used both by rmail and rnews
 
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ;;; We require lisp-mode to make sure that lisp-mode-syntax-table has
 ;;; been initialized.
diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index e0b44601b9e..190ba5aa887 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -1,12 +1,15 @@
 ;;; mailalias.el --- expand mailing address aliases defined in ~/.mailrc.
 
+;; Maintainer: FSF
+;; Last-Modified: 01 Jun 1992
+
 ;; Copyright (C) 1985, 1987 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ;; Called from sendmail-send-it, or similar functions,
 ;; only if some mail aliases are defined.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index f4a6656297c..9a88ce98005 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1,12 +1,15 @@
 ;;; rmail.el --- main code of "RMAIL" mail reader for Emacs.
 
+;; Maintainer: FSF
+;; Last-Modified: 24 Apr 1992
+
 ;; Copyright (C) 1985, 1986, 1987, 1988, 1991, 1992 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ;; Souped up by shane@mit-ajax based on ideas of rlk@athena.mit.edu
 ;;   New features include attribute and keyword support, message
diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index fa29b50c084..60eca528952 100644
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -1,12 +1,15 @@
 ;;; rmailedit.el --- "RMAIL edit mode"  Edit the current message.
 
+;; Maintainer: FSF
+;; Last-Modified: 31 Jul 1991
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (require 'rmail)
 
diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index b8ad6a59f58..1ac89d3461d 100644
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -1,12 +1,15 @@
 ;;; rmailkwd.el --- part of the "RMAIL" mail reader for Emacs.
 
+;; Maintainer: FSF
+;; Last-Modified: 31 Oct 1989
+
 ;; Copyright (C) 1985, 1988 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ;; Global to all RMAIL buffers.  It exists primarily for the sake of
 ;; completion.  It is better to use strings with the label functions
diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el
index cd042ae94c0..26ce9aa8bc5 100644
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -1,12 +1,15 @@
 ;;; rmailmsc.el --- miscellaneous support functions for the RMAIL mail reader
 
+;; Maintainer: FSF
+;; Last-Modified: 31 Oct 1989
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index a9dc5e385f1..fdb3f029ca6 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -1,7 +1,7 @@
 ;;; rmailout.el --- "RMAIL" mail reader for Emacs: output message to a file.
 
 ;; Maintainer: FSF
-;; Last-Modified: 1 Mar 1991
+;; Last-Modified: 01 Mar 1991
 
 ;; Copyright (C) 1985, 1987 Free Software Foundation, Inc.
 
@@ -9,7 +9,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el
index 32f459c0d4d..a069aec05c3 100644
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -1,11 +1,14 @@
 ;;; rmailsort.el --- Rmail: sort messages.
 
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1990 Free Software Foundation, Inc.
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -17,6 +20,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (require 'rmail)
 (require 'sort)
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 12f6cf527a3..1a4e0e48301 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -1,12 +1,15 @@
 ;;; rmailsum.el --- "RMAIL" mail reader for Emacs.
 
+;; Maintainer: FSF
+;; Last-Modified: 30 Nov 1990
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ;; summary things
 
diff --git a/lisp/mail/rnews.el b/lisp/mail/rnews.el
index 4bec3713f5e..a4fc266fd4c 100644
--- a/lisp/mail/rnews.el
+++ b/lisp/mail/rnews.el
@@ -1,12 +1,15 @@
 ;;; rnews.el --- USENET news reader for gnu emacs
 
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Change Log:
+
 ;; Created Sun Mar 10,1985 at 21:35:01 ads and sundar@hernes.ai.mit.edu
 ;; Should do the point pdl stuff sometime
 ;; finito except pdl.... Sat Mar 16,1985 at 06:43:44
@@ -44,6 +49,9 @@
 ;; added caesar-region, rename news-caesar-buffer-body, hacked accordingly
 ;;      tower@prep Nov 21 1986
 ;; added tower@prep 22 Apr 87
+
+;;; Code:
+
 (require 'mail-utils)
 
 (autoload 'rmail-output "rmailout"
diff --git a/lisp/mail/rnewspost.el b/lisp/mail/rnewspost.el
index 91077ed311a..cdc7dd388e7 100644
--- a/lisp/mail/rnewspost.el
+++ b/lisp/mail/rnewspost.el
@@ -1,12 +1,15 @@
 ;;; rnewspost.el --- USENET news poster/mailer for GNU Emacs
 
+;; Maintainer: FSF
+;; Last-Modified: 30 May 1992
+
 ;; Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;; Change Log:
+
 ;; moved posting and mail code from rnews.el
 ;;      tower@prep.ai.mit.edu Wed Oct 29 1986
 ;; brought posting code almost up to the revision of RFC 850 for News 2.11
@@ -32,8 +37,6 @@
 ;;      tower@prep 28 Apr 87
 ;; commented out Posting-Front-End to save USENET bytes tower@prep Jul 31 87
 ;; commented out -n and -t args in news-inews     tower@prep 15 Oct 87
-(require 'sendmail)
-(require 'rnews)
 
 ;Now in paths.el.
 ;(defvar news-inews-program "inews"
@@ -48,6 +51,11 @@
 ;;; >> Nuked by Mly to autoload those functions again, as the duplication of
 ;;; >>  code was making maintenance too difficult.
 
+;;; Code:
+
+(require 'sendmail)
+(require 'rnews)
+
 (defvar news-reply-mode-map () "Mode map used by news-reply.")
 
 (or news-reply-mode-map
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index a9f6c864fec..3373886703d 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1,12 +1,15 @@
 ;;; sendmail.el --- mail sending commands for Emacs.
 
+;; Maintainer: FSF
+;; Last-Modified: 24 Jun 1992
+
 ;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ;;;###autoload
 (defconst mail-self-blind nil "\
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index 5b80fbf8e2e..fe10a4e1a20 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -1,12 +1,15 @@
 ;;; undigest.el --- digest-cracking support for the RMAIL mail reader
 
+;; Maintainer: FSF
+;; Last-Modified: 14 Jul 1992
+
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,7 +21,11 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-;; note Interent RFP934
+;;; Commentary:
+
+;; See Internet RFC 934
+
+;;; Code:
 
 (defun undigestify-rmail-message ()
   "Break up a digest message into its constituent messages.
diff --git a/lisp/makesum.el b/lisp/makesum.el
index 8a7445d0b7c..46dd0dfe5a4 100644
--- a/lisp/makesum.el
+++ b/lisp/makesum.el
@@ -1,7 +1,7 @@
 ;;; makesum.el --- generate key binding summary for Emacs
 
 ;; Maintainer: FSF
-;; Last-Modified: 9 May 1991
+;; Last-Modified: 09 May 1991
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
@@ -9,7 +9,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/man.el b/lisp/man.el
index c2e0d45ac3f..77201267a80 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1,12 +1,15 @@
 ;;; man.el --- read in and display parts of Unix manual.
 
+;; Maintainer: FSF
+;; Last-Modified: 21 Dec 1991
+
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 ;;;###autoload
 (defun manual-entry (topic &optional section)
   "Display the Unix manual entry for TOPIC.
diff --git a/lisp/map-ynp.el b/lisp/map-ynp.el
index 5f4571f4ab8..16b34246790 100644
--- a/lisp/map-ynp.el
+++ b/lisp/map-ynp.el
@@ -1,11 +1,13 @@
 ;;; map-ynp.el --- General-purpose boolean question-asker.
 
+;; Author: Roland McGrath <roland@gnu.ai.mit.edu>
+;; Last-Modified: 14 Mar 1992
+
 ;;; Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-;;; Written by Roland McGrath.
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 1, or (at your option)
+;;; the Free Software Foundation; either version 2, or (at your option)
 ;;; any later version.
 ;;;
 ;;; This program is distributed in the hope that it will be useful,
@@ -17,7 +19,9 @@
 ;;; program's author (send electronic mail to roland@ai.mit.edu) or from
 ;;; the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA
 ;;; 02139, USA.
-;;;
+
+;;; Commentary:
+
 ;;; map-y-or-n-p is a general-purpose question-asking function.
 ;;; It asks a series of y/n questions (a la y-or-n-p), and decides to
 ;;; applies an action to each element of a list based on the answer.
@@ -26,6 +30,8 @@
 ;;; questions; ESC or q to answer n to all remaining questions; . to answer
 ;;; y once and then n for the remainder; and you can get help with C-h.
 
+;;; Code:
+
 (defun map-y-or-n-p-help (object objects action)
   (format "Type SPC or `y' to %s the current %s;
 DEL or `n' to skip the current %s;
diff --git a/lisp/medit.el b/lisp/medit.el
index 9c08ccb2b9d..c5dbf23817e 100644
--- a/lisp/medit.el
+++ b/lisp/medit.el
@@ -1,14 +1,16 @@
-;;; medit.el --- Lisp interface between GNU Emacs and MEDIT package.
+;;; medit.el --- front-end to the MEDIT package for editing MDL
+
+;; Author: K. Shane Hartman
+;; Maintainer: FSF
+;; Last-Modified: 05 Apr 1991
 
-;; Emacs under MDL.
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
-;; Principal author K. Shane Hartman
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -20,10 +22,13 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
 
 ;; >> This package depends on two MDL packages: MEDIT and FORKS which
 ;; >> can be obtained from the public (network) library at mit-ajax.
 
+;;; Code:
+
 (require 'mim-mode)
 
 (defconst medit-zap-file (concat "/tmp/" (user-login-name) ".medit.mud")
diff --git a/lisp/mim-mode.el b/lisp/mim-mode.el
index 1c0dec2ed59..09d7cb4350f 100644
--- a/lisp/mim-mode.el
+++ b/lisp/mim-mode.el
@@ -1,13 +1,16 @@
 ;;; mim-mode.el --- Mim (MDL in MDL) mode.
 
+;; Author: K. Shane Hartman
+;; Maintainer: FSF
+;; Last-Modified: 31 Oct 1989
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
-;; Principal author K. Shane Hartman
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,6 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (autoload 'fast-syntax-check-mim "mim-syntax"
           "Checks Mim syntax quickly.
diff --git a/lisp/mim-syntax.el b/lisp/mim-syntax.el
index a9ab16ca25d..ba84f538111 100644
--- a/lisp/mim-syntax.el
+++ b/lisp/mim-syntax.el
@@ -1,13 +1,16 @@
 ;;; mim-syntax.el --- syntax checker for Mim (MDL).
 
+;; Author: K. Shane Hartman
+;; Maintainer: FSF
+;; Last-Modified: 31 Oct 1989
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
-;; Principal author K. Shane Hartman
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,6 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (require 'mim-mode)
 
diff --git a/lisp/misc.el b/lisp/misc.el
index 3eea6ec22bb..ebdf52806f7 100644
--- a/lisp/misc.el
+++ b/lisp/misc.el
@@ -1,12 +1,15 @@
 ;;; misc.el --- basic editing commands for Emacs
 
+;; Maintainer: FSF
+;; Last-Modified: 31 Oct 1989
+
 ;; Copyright (C) 1989 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (defun copy-from-above-command (&optional arg)
   "Copy characters from previous nonblank line, starting just above point.
diff --git a/lisp/netunam.el b/lisp/netunam.el
index f6b59182839..4ace2c6e781 100644
--- a/lisp/netunam.el
+++ b/lisp/netunam.el
@@ -1,6 +1,6 @@
 ;;; netunam.el --- HP-UX RFA Commands
 
-;; Author: CPH <cph@zurich.ai.mit.edu>
+;; Author: Chris Hanson <cph@zurich.ai.mit.edu>
 ;; Last-Modified: 31 Oct 1989
 
 ;;; $Header: netunam.el,v 1.3 88/12/21 16:32:23 GMT cph Exp $
@@ -11,7 +11,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/novice.el b/lisp/novice.el
index c5374e8b8be..9849fd45ea7 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -1,12 +1,15 @@
 ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs.
 
+;; Maintainer: FSF
+;; Last-Modified: 22 May 1991
+
 ;; Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;; Code:
 
 ;; This function is called (by autoloading)
 ;; to handle any disabled command.
diff --git a/lisp/options.el b/lisp/options.el
index 86e8d493032..be6432c1c5d 100644
--- a/lisp/options.el
+++ b/lisp/options.el
@@ -1,12 +1,15 @@
 ;;; options.el --- edit Options command for Emacs.
 
+;; Maintainer: FSF
+;; Last-Modified: 10 Apr 1991
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ;;;###autoload
 (defun list-options ()
diff --git a/lisp/paths.el b/lisp/paths.el
index 074b979d558..3419c0d09c5 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -1,12 +1,15 @@
 ;;; paths.el --- define pathnames for use by various Emacs commands.
 
+;; Maintainer: FSF
+;; Last-Modified: 05 Dec 1991
+
 ;; Copyright (C) 1986, 1988 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
 
 ;; These are default settings for names of certain files and directories
 ;; that Emacs needs to refer to from time to time.
@@ -25,6 +29,8 @@
 ;; If these settings are not right, override them with `setq'
 ;; in site-init.el.  Do not change this file.
 
+;;; Code:
+
 (defvar Info-default-directory-list
   (list "/usr/local/lib/info/"
         (expand-file-name "../info/" data-directory))
diff --git a/lisp/play/dissociate.el b/lisp/play/dissociate.el
index 344d8ef3011..b0998320f7e 100644
--- a/lisp/play/dissociate.el
+++ b/lisp/play/dissociate.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 09 May 1991
+;; Keywords: games
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
@@ -9,7 +10,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el
index 0cb5dc9327b..5d6a437e07c 100644
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -1,12 +1,16 @@
 ;;; doctor.el --- psychological help for frustrated users.
 
+;; Maintainer: FSF
+;; Last-Modified: 24 Apr 1992
+;; Keywords: games
+
 ;; Copyright (C) 1985, 1987 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (defun doctor-cadr (x) (car (cdr x)))
 (defun doctor-caddr (x) (car (cdr (cdr x))))
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index b3696b50b33..68df99c3eba 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -1,12 +1,17 @@
 ;;; gomoku.el --- Gomoku game between you and Emacs
 
+;; Author: Phillippe Schnoebelen <phs@lifia.imag.fr>
+;; Last-Modified: 16 Mar 1992
+;; Adapted-By: ESR
+;; Keywords: games
+
 ;; Copyright (C) 1988 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +23,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
 ;;; Gomoku game between you and GNU Emacs.  Last modified on 13 Sep 1988
 ;;;
 ;;; Written by Ph. Schnoebelen (phs@lifia.imag.fr), 1987, 1988
@@ -74,6 +81,8 @@
 ;; The algorithm is briefly described in section "THE SCORE TABLE". Some
 ;; parameters may be modified if you want to change the style exhibited by the
 ;; program.
+
+;;; Code:
 
 ;;;
 ;;; GOMOKU MODE AND KEYMAP.
diff --git a/lisp/play/life.el b/lisp/play/life.el
index 3ce585d9f16..59dcbfb3856 100644
--- a/lisp/play/life.el
+++ b/lisp/play/life.el
@@ -1,13 +1,15 @@
 ;;; life.el --- John Horton Conway's `Life' game for GNU Emacs
 
+;; Author: Kyle Jones <talos!kjones@uunet.uu.net>
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1988 Free Software Foundation, Inc.
-;; Contributed by Kyle Jones, talos!kjones@uunet.uu.net
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 (defconst life-patterns
   [("@@@" " @@" "@@@")
    ("@@@ @@@" "@@  @@ " "@@@ @@@")
diff --git a/lisp/play/spook.el b/lisp/play/spook.el
index 98b22fc2086..9c62ed0e5a1 100644
--- a/lisp/play/spook.el
+++ b/lisp/play/spook.el
@@ -1,7 +1,7 @@
 ;;; spook.el --- spook phrase utility for overloading the NSA line eater
 
 ;;; Maintainer: FSF
-;;; Last-modified: 05 Dec 1991
+;;; Last-Modified: 05 Dec 1991
 
 ;; Copyright (C) 1988 Free Software Foundation, Inc.
 
@@ -9,7 +9,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/play/yow.el b/lisp/play/yow.el
index 9f71ee5b925..ac8c43d5a31 100644
--- a/lisp/play/yow.el
+++ b/lisp/play/yow.el
@@ -1,7 +1,7 @@
 ;;; yow.el --- generate random zippyisms
 
 ;; Maintainer: FSF
-;; Last-modified: 14 Jun 1992
+;; Last-Modified: 14 Jun 1992
 
 ;; Copyright (C) 1985, 1987 Free Software Foundation, Inc.
 
@@ -9,7 +9,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/progmodes/c-mode.el b/lisp/progmodes/c-mode.el
index c2f98c47f02..46ffe0647f6 100644
--- a/lisp/progmodes/c-mode.el
+++ b/lisp/progmodes/c-mode.el
@@ -1,12 +1,16 @@
 ;;; c-mode.el --- C code editing commands for Emacs
 
+;; Maintainer: FSF
+;; Last-Modified: 11 Jul 1992
+;; Keywords: c
+
 ;; Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (defvar c-mode-abbrev-table nil
   "Abbrev table in use in C mode.")
diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index 431fa13cf1f..2529fbbe69e 100644
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -1,12 +1,16 @@
 ;;; cmacexp.el --- C macro expansion
 
+;; Maintainer: FSF
+;; Last-Modified: 17 Apr 1992
+;; Keywords: c
+
 ;; Copyright (C) 1988 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (defvar c-macro-preprocessor "/lib/cpp"
   "*Command to be used for C preprocessing.")
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 485ce393200..2c171190093 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1,4 +1,8 @@
-;; Tags facility for Emacs.
+;; etags.el --- etags facility for Emacs
+
+;; Author: Roland McGrath <roland@gnu.ai.mit.edu>
+;; Keywords: tools
+
 ;; Copyright (C) 1985, 1986, 1988, 1989, 1991, 1992
 ;;      Free Software Foundation, Inc.
 
@@ -18,6 +22,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 ;;;###autoload
 (defvar tags-file-name nil "\
 *File name of tags table.
@@ -1079,3 +1085,5 @@ for \\[find-tag] (which see).  See also `visit-tags-table-buffer'."
 ;;;###autoload (define-key esc-map "?" 'complete-tag)   ;? XXX
 
 (provide 'etags)
+
+;;; etags.el ends here
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 326464d8804..60e1e6e4005 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -1,6 +1,30 @@
-;;; fortran.el --- Fortran mode for GNU Emacs  (version 1.28.3, July 15, 1991)
+;;; fortran.el --- Fortran mode for GNU Emacs
+
+;; Author: Michael D. Prange <prange@erl.mit.edu>
+;; Maintainer: bug-fortran-mode@erl.mit.edu
+;; Version 1.28.3
+;; Last-Modified: 15 Jul 1991
 
 ;;; Copyright (c) 1991 Free Software Foundation, Inc.
+
+;; 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
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+
+;;; Commentary:
+
 ;;; Written by Michael D. Prange (prange@erl.mit.edu)
 ;;; Maintained (as of version 1.28) by Stephen A. Wood (saw@hallc1.cebaf.gov)
 ;;; This version is an update of version 1.21 (Oct 1, 1985).
@@ -70,26 +94,12 @@
 ;;; 14. When in tab mode, the fortran column ruler will not be correct if
 ;;;     tab-width is not 8.
 
-;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
-;; any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
 ;;; Author acknowledges help from Stephen Gildea <gildea@erl.mit.edu>
 
 ;;; Bugs to bug-fortran-mode@erl.mit.edu
 
+;;; Code:
+
 ;;;###autoload
 (defvar fortran-tab-mode-default nil
   "*Default tabbing/carriage control style for empty files in fortran mode.
diff --git a/lisp/progmodes/icon.el b/lisp/progmodes/icon.el
index cab251427ba..8905bee0b5d 100644
--- a/lisp/progmodes/icon.el
+++ b/lisp/progmodes/icon.el
@@ -1,19 +1,16 @@
 ;;; icon.el --- mode for editing Icon code
 
-;; Note: use
-;;  (autoload 'icon-mode "icon" nil t)
-;;  (setq auto-mode-alist (cons '("\\.icn$" . icon-mode) auto-mode-alist))
-;; if not permanently installed in your emacs
+;; Author: Chris Smith <convex!csmith>
+;; Created: 15 Feb 89
+;; Last-Modified: 06 Mar 1991
 
-;; Icon code editing commands for Emacs
-;; Derived from c-mode.el  15-Feb-89  Chris Smith  convex!csmith
 ;; Copyright (C) 1989 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -25,6 +22,14 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
+;; Note: use
+;;  (autoload 'icon-mode "icon" nil t)
+;;  (setq auto-mode-alist (cons '("\\.icn$" . icon-mode) auto-mode-alist))
+;; if not permanently installed in your emacs
+
+;;; Code:
 
 (defvar icon-mode-abbrev-table nil
   "Abbrev table in use in Icon-mode buffers.")
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index ddbbf804962..ba98d5011b6 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -1,13 +1,15 @@
 ;;; prolog.el --- major mode for editing and running Prolog under Emacs
 
+;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
+;; Last-Modified: 08 May 1989
+
 ;; Copyright (C) 1986, 1987 Free Software Foundation, Inc.
-;; Author Masanobu UMEDA (umerin@flab.flab.fujitsu.junet)
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 (defvar prolog-mode-syntax-table nil)
 (defvar prolog-mode-abbrev-table nil)
 (defvar prolog-mode-map nil)
diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el
index aa02c037806..1de78608655 100644
--- a/lisp/progmodes/scheme.el
+++ b/lisp/progmodes/scheme.el
@@ -1,13 +1,17 @@
 ;;; scheme.el --- Scheme mode, and its idiosyncratic commands.
 
+;; Author: Bill Rozas <jinz@prep.ai.mit.edu>
+;; Last-Modified: 16 Mar 1992
+
+;;; $Header: scheme.el,v 1.7 88/07/15 20:20:00 GMT cph Exp $
+
 ;; Copyright (C) 1986, 1987, 1988 Free Software Foundation, Inc.
-;; Adapted from Lisp mode by Bill Rozas, jinx@prep.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,13 +23,14 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
 
+;; Adapted from Lisp mode by Bill Rozas, jinx@prep.
 ;; Initially a query replace of Lisp mode, except for the indentation 
 ;; of special forms.  Probably the code should be merged at some point 
 ;; so that there is sharing between both libraries.
 
-;;; $Header: scheme.el,v 1.7 88/07/15 20:20:00 GMT cph Exp $
-
+;;; Code:
 
 (defvar scheme-mode-syntax-table nil "")
 (if (not scheme-mode-syntax-table)
diff --git a/lisp/rect.el b/lisp/rect.el
index 163f1c162ed..84aa7b73ae1 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -1,7 +1,7 @@
 ;;; rect.el --- rectangle functions for GNU Emacs.
 
 ;; Maintainer: FSF
-;; Last-Modified: 9 May 1991
+;; Last-Modified: 09 May 1991
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
@@ -9,7 +9,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/register.el b/lisp/register.el
index d1870d95bee..047bcba1269 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -1,7 +1,7 @@
 ;;; register.el --- register commands for Emacs.
 
 ;; Maintainer: FSF
-;; Last-Modified: 9 Jul 1992
+;; Last-Modified: 09 Jul 1992
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
@@ -9,7 +9,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/reposition.el b/lisp/reposition.el
index 9e0e881748f..9a6a9e23228 100644
--- a/lisp/reposition.el
+++ b/lisp/reposition.el
@@ -1,12 +1,16 @@
 ;;; reposition.el --- center a Lisp function or comment on the screen
 
+;; Author: Michael D. Ernst <mernst@theory.lcs.mit.edu>
+;; Maintainer: FSF
+;; Last-Modified: 13 May 1991
+
 ;; Copyright (C) 1991 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +22,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
 ;;; Written by Michael D. Ernst, mernst@theory.lcs.mit.edu, Jan 1991.
 
 ;;; Reposition-window makes an entire function definition or comment visible,
@@ -32,6 +38,8 @@
 ;;; after one of the same name in ZMACS, but the code is all-new and the
 ;;; behavior in some situations differs.
 
+;;; Code:
+
 ;;;###autoload
 (defun reposition-window (&optional arg)
   "Make the current definition and/or comment visible.
diff --git a/lisp/rot13.el b/lisp/rot13.el
index 253f6cf20af..939539b49e7 100644
--- a/lisp/rot13.el
+++ b/lisp/rot13.el
@@ -1,12 +1,16 @@
 ;;; rot13.el --- display a buffer in rot13.
 
+;; Author: Howard Gayle:
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1988 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,11 +22,14 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;; Commentary:
 
 ;; Written by Howard Gayle.  See case-table.el for details.
 
 ;; This hack is mainly to show off the char table stuff.
 
+;;; Code:
+
 (defvar rot13-display-table
   (let ((table (make-display-table))
         (i 0))
diff --git a/lisp/server.el b/lisp/server.el
index 8aaa836b999..eee0b78f8b2 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1,7 +1,7 @@
 ;;; server.el --- Lisp code for GNU Emacs running as server process.
 
 ;; Author: William Sommerfeld <wesommer@athena.mit.edu>
-;; Last-Modified: 5 Dec 1991
+;; Last-Modified: 05 Dec 1991
 
 ;; Changes by peck@sun.com and by rms.
 
@@ -11,7 +11,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/shell.el b/lisp/shell.el
index 3279c1dfc81..3a5968e0b6b 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -9,7 +9,7 @@
 
 ;;; 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
-;;; the Free Software Foundation; either version 1, or (at your option)
+;;; the Free Software Foundation; either version 2, or (at your option)
 ;;; any later version.
 
 ;;; GNU Emacs is distributed in the hope that it will be useful,
@@ -579,7 +579,7 @@ This is a good place to put keybindings.")
 ;;;   The variables and functions that were changed to have "cmushell-" 
 ;;;   prefixes are:
 ;;;       shell-directory-stack (v), shell-directory-tracker (f)
-;;;   This should not affect users, only elisp hackers. Hopefully
+;;;   This should not affect users, only Emacs Lisp hackers. Hopefully
 ;;;   one day shell.el will just go away, and we can drop all this
 ;;;   "cmushell" bullshit.
 ;;; - Upgraded process sends to use comint-send-string instead of
diff --git a/lisp/sort.el b/lisp/sort.el
index ebb0980b995..2e4a4a087a9 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -1,12 +1,16 @@
 ;;; sort.el --- commands to sort text in an Emacs buffer.
 
+;; Author: Howie Kaye
+;; Maintainer: FSF
+;; Last-Modified: 28 Aug 1990
+
 ;; Copyright (C) 1986, 1987 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,7 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-;; Original version of most of this contributed by Howie Kaye
+;;; Code:
 
 (defun sort-subr (reverse nextrecfun endrecfun &optional startkeyfun endkeyfun)
   "General text sorting routine to divide buffer into records and sort them.
diff --git a/lisp/sun-curs.el b/lisp/sun-curs.el
index 36df2de60a4..7db1f5ee2bb 100644
--- a/lisp/sun-curs.el
+++ b/lisp/sun-curs.el
@@ -1,12 +1,15 @@
 ;;; sun-cursors.el --- cursor definitions for Sun windows
 
+;; Author: Jeff Peck <peck@sun.com>
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1987 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 ;;;
 ;;; Added some more cursors and moved the hot spots
 ;;; Cursor defined by 16 pairs of 16-bit numbers
diff --git a/lisp/sun-fns.el b/lisp/sun-fns.el
index 95ed1ed50b3..bdb43faa1d6 100644
--- a/lisp/sun-fns.el
+++ b/lisp/sun-fns.el
@@ -1,12 +1,15 @@
 ;;; sun-fns.el --- subroutines of Mouse handling for Sun windows
 
+;; Author: Jeff Peck <peck@sun.com>
+;; Last-Modified: 14 Aug 1987
+
 ;; Copyright (C) 1987 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
 ;;; Submitted Mar. 1987, Jeff Peck
 ;;;                      Sun Microsystems Inc. <peck@sun.com>
 ;;; Conceived Nov. 1986, Stan Jefferson,
@@ -25,7 +30,6 @@
 ;;; GoodIdeas Feb. 1987, Steve Greenbaum
 ;;; & UpClicks           Reasoning Systems, Inc.
 ;;;
-(require 'sun-mouse)
 ;;;
 ;;; Functions for manipulating via the mouse and mouse-map definitions
 ;;; for accessing them.  Also definitons of mouse menus.
@@ -48,6 +52,11 @@
 ;;; bind the mouse button to an s-exp that contains the necessary parameters.
 ;;; See "minibuffer" bindings for examples.
 ;;;
+
+;;; Code:
+
+(require 'sun-mouse)
+
 (defconst cursor-pause-milliseconds 300
   "*Number of milliseconds to display alternate cursor (usually the mark)")
 
diff --git a/lisp/sun-keys.el b/lisp/sun-keys.el
index 13ebee3a4d1..b059a8e20c9 100644
--- a/lisp/sun-keys.el
+++ b/lisp/sun-keys.el
@@ -1,19 +1,15 @@
 ;;; sun-keys.el --- support for Sun function keys
 
-;;; Support (cleanly) for Sun function keys.  Provides help facilities,
-;;; better diagnostics, etc.
-;;;
-;;; To use: make sure your .ttyswrc binds 'F1' to <ESC> * F1 <CR> and so on.
-;;;         load this lot from your start_up
-;;;
-;;; 
-;;;    Copyright (C) 1986 Free Software Foundation, Inc.
+;; Author: Ian G. Batten <batten@uk.ac.bham.multics>
+;; Last-Modified: 30 May 1992
+
+;;; Copyright (C) 1986 Free Software Foundation, Inc.
 ;;; 
 ;;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -24,9 +20,16 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+
+;;; Commentary:
+
+;;; Support (cleanly) for Sun function keys.  Provides help facilities,
+;;; better diagnostics, etc.
 ;;;
-;;; Batten@uk.ac.bham.multics (Ian G. Batten)
-;;;
+;;; To use: make sure your .ttyswrc binds 'F1' to <ESC> * F1 <CR> and so on.
+;;;         load this lot from your start_up
+
+;;; Code:
 
 (defun sun-function-keys-dispatch (arg)
   "Dispatcher for function keys."
diff --git a/lisp/tabify.el b/lisp/tabify.el
index ab28397ab02..eabaab10a48 100644
--- a/lisp/tabify.el
+++ b/lisp/tabify.el
@@ -1,7 +1,7 @@
 ;;; tabify.el --- tab conversion commands for Emacs
 
 ;; Maintainer: FSF
-;; Last-Modified: 9 May 1991
+;; Last-Modified: 09 May 1991
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
@@ -9,7 +9,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index aeeb2515aac..57c11db9edc 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -1,7 +1,7 @@
 ;;; tar-mode.el --- simple editing of tar files from GNU emacs
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
-;; Created: 4 Apr 1990
+;; Created: 04 Apr 1990
 ;; Version: 1.21
 ;; Last-Modified: 10 Mar 1991
 
@@ -11,7 +11,7 @@
 ;;;
 ;;; 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
-;;; the Free Software Foundation; either version 1, or (at your option)
+;;; the Free Software Foundation; either version 2, or (at your option)
 ;;; any later version.
 ;;;
 ;;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/term/bg-mouse.el b/lisp/term/bg-mouse.el
index c08ed9ed28d..4496f0ec4fe 100644
--- a/lisp/term/bg-mouse.el
+++ b/lisp/term/bg-mouse.el
@@ -1,13 +1,18 @@
 ;;; bg-mouse.el --- GNU Emacs code for BBN Bitgraph mouse.
 
+;; Author: John Robinson <jr@bbn-unix.arpa>
+;;      Stephen Gildea <gildea@bbn.com>
+;; Maintainer: FSF
+;; Last-Modified: 14 Jul 1992
+;; Keywords: hardware
+
 ;; Copyright (C) Free Software Foundation, Inc. Oct 1985.
-;; Time stamp <89/03/21 14:27:08 gildea>
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,9 +24,11 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ;;;  Original version by John Robinson (jr@bbn-unix.arpa, bbncca!jr), Oct 1985
 ;;;  Modularized and enhanced by gildea@bbn.com Nov 1987
+;;;  Time stamp <89/03/21 14:27:08 gildea>
 
 ;;;  User customization option:
 
@@ -62,9 +69,9 @@ To reinitialize the mouse if the terminal is reset, type ESC : RET"
   (interactive "P")
   (bg-get-tty-num semicolon)
   (let*
-      ((screen-mouse-x (min (1- (screen-width)) ;don't hit column 86!
+      ((screen-mouse-x (min (1- (frame-width))  ;don't hit column 86!
                             (/ (bg-get-tty-num semicolon) 9)))
-       (screen-mouse-y (- (1- (screen-height)) ;assume default font size.
+       (screen-mouse-y (- (1- (frame-height)) ;assume default font size.
                           (/ (bg-get-tty-num semicolon) 16))) 
        (bg-mouse-buttons (% (bg-get-tty-num ?c) 8))
        (bg-mouse-window (bg-window-from-x-y screen-mouse-x screen-mouse-y))
diff --git a/lisp/term/sun-mouse.el b/lisp/term/sun-mouse.el
index fad388337e8..ccd48d6af71 100644
--- a/lisp/term/sun-mouse.el
+++ b/lisp/term/sun-mouse.el
@@ -1,12 +1,16 @@
 ;;; sun-mouse.el --- mouse handling for Sun windows
 
+;; Author: Jeff Peck
+;; Maintainer: FSF
+;; Last-Modified: 14 Jul 1992
+
 ;; Copyright (C) 1987 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +22,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
 ;;; Jeff Peck, Sun Microsystems, Jan 1987.
 ;;; Original idea by Stan Jefferson
 
@@ -34,6 +40,8 @@
 ;;;   extra-click-wait, scrollbar-width
 ;;;
 
+;;; Code:
+
 (defvar extra-click-wait 150
   "*Number of milliseconds to wait for an extra click.
 Set this to zero if you don't want chords or double clicks.")
diff --git a/lisp/term/sup-mouse.el b/lisp/term/sup-mouse.el
index be7e7f0ff4d..86e7c6eed9c 100644
--- a/lisp/term/sup-mouse.el
+++ b/lisp/term/sup-mouse.el
@@ -1,15 +1,11 @@
-;;; sup-mouse.el --- GNU Emacs code for lambda/supdup mouse
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                                                           ;;
-;;      File:     sup-mouse.el                                               ;;
-;;      Author:   Wolfgang Rupprecht                                         ;;
-;;      Created:  Fri Nov 21 19:22:22 1986                                   ;;
-;;      Contents: supdup mouse support for lisp machines                     ;;
-;;                                                                           ;;
-;;     (from code originally written by John Robinson@bbn for the bitgraph)  ;;
-;;                                                                           ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; sup-mouse.el --- supdup mouse support for lisp machines
+
+;; Author: Wolfgang Rupprecht
+;; Maintainer: FSF
+;; Created: 21 Nov 1986
+;; Last-Modified: 16 Mar 1992
+
+;;     (from code originally written by John Robinson@bbn for the bitgraph)
 
 ;; Copyright (C) Free Software Foundation 1985, 1986
 
@@ -17,7 +13,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -29,6 +25,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 ;;;  User customization option:
 
 (defvar sup-mouse-fast-select-window nil
diff --git a/lisp/terminal.el b/lisp/terminal.el
index de8fdf53a76..6e9d954ae39 100644
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -1,13 +1,16 @@
 ;;; terminal.el --- terminal emulator for GNU Emacs.
 
+;; Author: Richard Mlynarik <mly@eddie.mit.edu>
+;; Maintainer: FSF
+;; Last-Modified: 05 May 1992
+
 ;; Copyright (C) 1986, 1987, 1988, 1989 Free Software Foundation, Inc.
-;; Written by Richard Mlynarik, November 1986.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,6 +22,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 ;;>>TODO
 ;;>> terminfo?
 ;;>> ** Nothing can be done about emacs' meta-lossage **
diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el
index 8c7c38c4c31..22110bb4afd 100644
--- a/lisp/textmodes/bib-mode.el
+++ b/lisp/textmodes/bib-mode.el
@@ -1,12 +1,16 @@
 ;;; bib-mode.el --- bib-mode, major mode for editing bib files.
 
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
+;; Keywords: bib
+
 ;; Copyright (C) 1989 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ;; Bib-Mode
 ;;   GNU Emacs code to help maintain databases compatible with (troff)
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 4579760d9bb..083bb6befb9 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -1,12 +1,12 @@
 ;;; bibtex.el --- BibTeX mode for GNU Emacs
 
-;; Copyright (C) 1985, 1986, 1987, 1990 Free Software Foundation, Inc.
+;; Copyright (C) 1992 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,40 +18,24 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-;;; Mike Newton (newton@gumby.cs.caltech.edu) 92.2.11
-;;;  * Fixed  bibtex-field string to allow things like:
-;;;   author = "{S}schr\"odinger"     or
-;;;   author = "{S}schr\"{o}dinger"   or
-;;;   author = "{S}schr{\"o}dinger"   or
-;;; NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE 
-;;; NOTE: This is the last update I plan to do.
-;;; NOTE: the previous version was submitted and, according to RMS,
-;;;       accepted as the release version for ver 19.
-;;; NOTE: PLEASE DO NOT SEND ME ANY MORE 'PLEASE ADD THIS' MESSAGES.
-;;; NOTE: I am no longer taking care of this package.
-;;; NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE 
-
-;;; Mike Newton (newton@gumby.cs.caltech.edu) 91.1.24
-;;;  * bibtex-make-optional-field : modified to make fields align up after 
-;;;    the OPT's have been removed.
-;;;  * bibtex-make-optional-field : modified to check bibtex-use-OPT-prefix
-;;;  * bibtex-make*field : modified to call new procedure:
-;;;  * bibtex-insert-field-delimeters : which does delimeter insertion based on
-;;;  * bibtex-curly-delimeters : a list of atoms
-;;;  * fixed spelling of bibtex-name-alignment wherever used
-;;;  * bibtex-inside-field : allows '}'s at end
-;;;  * bibtex-find-text : allows '{' and '}'s at start or end
-;;;  * bibtex-enclosing-regexp fixed for case where start-point was at end of 
-;;;    pattern.
-;;;  * bibtex-clean-entry : allow bibtex-save-OPT to save some optional fields
-;;;  * bibtex-move-outside-of-entry : could overwrite first line of a following
-;;;    comment or other text if it did not look like a bibtex entry
-
-;;; Mike Newton (newton@gumby.cs.caltech.edu) 91.1.20
-;;;  * bibtex.el/bibtex-mode : updated comments to indicate new use of 
-;;;    address, add minor explanations and fix small omissions.
-;;;  * bibtex.el/bibtex-entry : fixed spelling of variable
-
+;;; (current keeper: shapiro@corto.inria.fr)
+
+;;; alarson@src.honeywell.com 92-Jan-31
+;;;   Added support for: ispell, beginning/end of entry movement, a simple
+;;;   outline like mode (hide the bodies of bibtex entries), support for
+;;;   sorting bibtex entries, and maintaining them in sorted order, and
+;;;   simple buffer validation.
+;;;   User visible functions added:
+;;;      ispell-{abstract,bibtex-entry}, {beginning,end}-of-bibtex-entry
+;;;      hide-bibtex-entry-bodies, sort-bibtex-entries, validate-bibtex-
+;;;      buffer, find-bibtex-duplicates
+;;;   user visible variables added:
+;;;      bibtex-maintain-sorted-entries
+;;;   new local keybindings:
+;;;     "       TeX-insert-quote
+;;;     C-c$   ispell-bibtex-entry
+;;;     M-C-a  beginning-of-bibtex-entry
+;;;     M-C-e  end-of-bibtex-entry
 ;;; Mike Newton (newton@gumby.cs.caltech.edu) 90.11.17
 ;;;  * Handle items like
 ;;;          title = poft # "Fifth Tri-quaterly" # random-conf,
@@ -60,17 +44,11 @@
 ;;;  * fixed 'bibtex-find-it's doc string's location
 ;;;  * bibtex-field-text made more general (it wouldnt handle the # construct)
 ;;;             and it now handles a small subset of the {} cases
-;;;  * put DEA thesis back in (why get rid of good code?) 
-;;;  * merged into release 19 version code
-;;;  * if cross-ref'ing is on, put 'pages' near top of OPTs, as the other
-;;;             entries are unlikely to be used.
-;;;  * skip-whitespace replaced by skip-chars-forward (also done 
-;;;             by Marc Shairo)
 
 ;;; Bengt Martensson, March 6
 ;;;   Adapted to Bibtex 0.99 by updating the optional fields according
 ;;;   to the document BibTeXing, Oren Patashnik, dated January 31, 1988.
-;;;   Updated documentation strings accordingly.  Added .
+;;;   Updated documentation strings accordingly.  Added (provide 'bibtex).
 ;;;   If bibtex-include-OPT-crossref is non-nil, every entry will have
 ;;;   an OPTcrossref field, analogously for bibtex-include-OPTkey and
 ;;;   bibtex-include-OPTannote.  Added bibtex-preamble, bound to ^C^EP,
@@ -80,13 +58,14 @@
 ;;;   correctly, BibTeX 0.99 broke it.)
 ;;;   Added bibtex-clean-entry-zap-empty-opts, defvar'd to t.  If it
 ;;;   is nil, bibtex-clean-entry will leave empty optional fields alone.
-  
+
 ;;; Marc Shapiro 1-feb-89: integrated changes by Bengt Martensson 88-05-06:
 ;;;   Added Sun menu support.  Locally bound to right mouse button in 
 ;;;   bibtex-mode.  Emacs 18.49 allows local mouse bindings!!
 ;;;   Commented out DEAthesis.
 
 ;;; Marc Shapiro 6-oct-88
+;;;  * skip-whitespace replaced by skip-chars-forward
 ;;;  * use indent-to-column instead of inserting tabs (changes to 
 ;;;    bibtex-entry, bibtex-make-entry, bibtex-make-OPT-entry, renamed to
 ;;;    bibtex-make-optional-entry)
@@ -100,6 +79,7 @@
 ;;;  * bibtex-clean-entry signals mandatory fields left empty.
 
 ;;; Marc Shapiro 18-jul-88
+;;;  * Fixed bug in bibtex-flash-entry
 ;;;  * Moved all the entry type keystrokes to "C-c C-e something" (instead of
 ;;;    "C-c something" previously) to make room for more.  C-c C-e is
 ;;;    supposed to stand for "entry" [idea taken from mail-mode].  Moved
@@ -132,7 +112,7 @@
 ;;;    run-hooks
 
 ;;; Bengt Martensson <ubrinf!mond!bengt> 87-06-28
-;;; (Bengt Martensson <bengt@mathematik.uni-Bremen.de> 87-06-28)
+;;; Bengt Martensson <bengt@mathematik.uni-Bremen.de> 87-06-28
 ;;;   Original version
 
 ;;; NOTE by Marc Shapiro, 14-dec-87:
@@ -140,37 +120,42 @@
 ;;; Trouble is, in Emacs 18.44 you can't have a mode-specific mouse binding,
 ;;; so it will remain active in all windows.  Yuck!
 
+(provide 'bibtex)
+
+;;; these guys typically don't have autoloads...[alarson:19920131.1548CST]
+(if (not (fboundp 'TeX-insert-quote))
+    (autoload 'TeX-insert-quote "tex-mode"))
+(if (not (fboundp 'sort-subr))
+    (autoload 'sort-subr "sort"))
+
+
+
 (defvar bibtex-mode-syntax-table nil "")
 (defvar bibtex-mode-abbrev-table nil "")
 (define-abbrev-table 'bibtex-mode-abbrev-table ())
 (defvar bibtex-mode-map (make-sparse-keymap) "")
+
 (defvar bibtex-pop-previous-search-point nil
   "Next point where bibtex-pop-previous should start looking for a similar
 entry.")
+
 (defvar bibtex-pop-next-search-point nil
   "Next point where bibtex-pop-next should start looking for a similar
 entry.")
 
 (defvar bibtex-clean-entry-zap-empty-opts t
   "*If non-nil, bibtex-clean-entry will delete all empty optional fields.")
+
 (defvar bibtex-include-OPTcrossref t
   "*If non-nil, all entries will have an OPTcrossref field.")
 (defvar bibtex-include-OPTkey t
   "*If non-nil, all entries will have an OPTkey field.")
 (defvar bibtex-include-OPTannote t
   "*If non-nil, all entries will have an OPTannote field.")
-(defvar bibtex-use-OPT-prefix t
-  "*If non-nil, put OPT string before optionals.  Usually desired!")
-(defvar bibtex-save-OPT nil
-  "*List of atoms (representing strings) which are optional fields that
-should not be deleted if null.")
-(defvar bibtex-curly-delimeters nil
-  "List of atoms representing strings (in any case) that should have curly
-braces used as their delimeters instead of double quotes.")
-
 
 ;; note: the user should be allowed to have their own list of always
 ;;       available optional fields.  exs: "keywords" "categories"
+
 (defvar bibtex-mode-user-optional-fields nil            ;no default value
   "*List of optional fields that user want to have as always present 
 when making a bibtex entry.  One possibility is for ``keywords''")
@@ -208,40 +193,32 @@ when making a bibtex entry.  One possibility is for ``keywords''")
 ;;   key = {Volume-2},
 ;;   note = "Volume~2 is listed under Knuth \cite{book-full}"
 ;; i have added a few of these, but not all! -- MON
-;; 92.2.11: also must handle: 
-;;   author = "{S}schr\"odinger"   or
-;;   author = "{S}schr\"{o}dinger"   or
-;;   author = "{S}schr{\"o}dinger"   or
-
 
 (defconst bibtex-field-const
   "[0-9A-Za-z][---A-Za-z0-9:_+]*"
   "Format of a bibtex field constant.")
 
-(defconst bibtex-field-string   ;;was:(concat "\"[^\"]*[^\\\\]\"\\|\"\"")
+(defconst bibtex-field-string
   (concat
-     "\"\\([^\"]*[\\\\][\"]\\)*[^\"]*[^\\\\]\""
-     "\\|"      ;ie: OR
-     "\"\""
-     "\\|"      ;ie: OR
-     "\"[^\"]*[^\\\\]\"")
-  "Match either a \"-d string or an empty string or a plain string.")
+    "\"[^\"]*[^\\\\]\"\\|\"\"")
+  "Match either a string or an empty string.")
+
 (defconst bibtex-field-string-or-const
   (concat bibtex-field-const "\\|" bibtex-field-string)
   "Match either bibtex-field-string or bibtex-field-const.")
 
-;(defconst bibtex-field-text
-;  "\"[^\"]*[^\\\\]\"\\|\"\"\\|[0-9A-Za-z][---A-Za-z0-9:_+]*"
-;  "Regexp defining the text part of a bibtex field: either a string, or an empty string, or a constant.")
-
 (defconst bibtex-field-text
   (concat
     "\\(" bibtex-field-string-or-const "\\)"
         "\\([ \t\n]+#[ \t\n]+\\(" bibtex-field-string-or-const "\\)\\)*\\|"
-    "{[^{}]*[^\\\\]}" "\\|" "{}")
+    "{[^{}]*[^\\\\]}")
   "Regexp defining the text part of a bibtex field: either a string, or
 an empty string, or a constant followed by one or more # / constant pairs.
-Also matches simple {...} patterns, including the special case {}.")
+Also matches simple {...} patterns.")
+
+;(defconst bibtex-field-text
+;  "\"[^\"]*[^\\\\]\"\\|\"\"\\|[0-9A-Za-z][---A-Za-z0-9:_+]*"
+;  "Regexp defining the text part of a bibtex field: either a string, or an empty string, or a constant.")
 
 (defconst bibtex-field
   (bibtex-cfield bibtex-field-name bibtex-field-text)
@@ -256,7 +233,6 @@ Also matches simple {...} patterns, including the special case {}.")
 (defconst bibtex-reference-type
   "@[A-Za-z]+"
   "Regexp defining the type part of a bibtex reference entry")
-
 (defconst bibtex-reference-head
   (concat "^[ \t]*\\("
           bibtex-reference-type
@@ -281,7 +257,7 @@ bibtex-reference-head")
   "The regexp subexpression number of the key part in
 bibtex-reference")
 
-;;; string definitions. note bibtex-string is a constant and a defun !
+;;; strings
 (defconst bibtex-string
   (concat "^[ \t]*@[sS][tT][rR][iI][nN][gG][ \t\n]*[({][ \t\n]*\\("
           bibtex-field-name
@@ -289,13 +265,12 @@ bibtex-reference")
           bibtex-field-text
           "\\)[ \t\n]*[})]")
   "Regexp defining the format of a bibtex string entry")
-
 (defconst bibtex-name-in-string 1
   "The regexp subexpression of the name part in bibtex-string")
 (defconst bibtex-text-in-string 2
   "The regexp subexpression of the text part in bibtex-string")
 
-(defconst bibtex-name-alignment 2
+(defconst bibtex-name-alignement 2
   "Alignment for the name part in BibTeX fields.
 Chosen on aesthetic grounds only.")
 
@@ -334,7 +309,7 @@ mouse button.
 
 Fields:
     address
-           Publisher's address, or for conference, location held
+           Publisher's address
     annote
            Long annotation used for annotated bibliographies (begins sentence)
     author
@@ -343,11 +318,11 @@ Fields:
            Book title when the thing being referenced isn't the whole book.
            For book entries, the title field should be used instead.
     chapter
-           Chapter number (or section or whatever).
+           Chapter number
     crossref
            The database key of the entry being cross referenced.
     edition
-           Edition of a book (e.g., \"second\")
+           Edition of a book (e.g., ""second"")
     editor
            Name(s) of editor(s), in BibTeX name format.
            If there is also an author field, then the editor field should be
@@ -359,8 +334,7 @@ Fields:
     journal
            Journal name (macros are provided for many)
     key
-           Alphabetizing, labeling and cross-refing key (needed when no 
-           author or editor)
+           Alphabetizing and labeling key (needed when no author or editor)
     month
            Month (macros are provided)
     note
@@ -381,8 +355,8 @@ Fields:
     title
            The title of the thing being referenced
     type
-           Type of a technical report (e.g., \"Research Note\") to be used
-           instead of the default \"Technical Report\"
+           Type of a technical report (e.g., ""Research Note"") to be used
+           instead of the default ""Technical Report""
     volume
            Volume of a journal or multivolume work
     year
@@ -425,6 +399,12 @@ non-nil."
   (define-key bibtex-mode-map "\C-c\C-k" 'bibtex-kill-optional-field)
   (define-key bibtex-mode-map "\C-c\C-d" 'bibtex-empty-field)
 
+  ;; [alarson:19920131.1543CST]
+  (define-key bibtex-mode-map "\""   'TeX-insert-quote)
+  (define-key bibtex-mode-map "\C-c$"   'ispell-bibtex-entry)
+  (define-key bibtex-mode-map "\M-\C-a"   'beginning-of-bibtex-entry)
+  (define-key bibtex-mode-map "\M-\C-e"   'end-of-bibtex-entry)
+
   (define-key bibtex-mode-map "\C-c\C-e\C-a" 'bibtex-Article)
   (define-key bibtex-mode-map "\C-c\C-e\C-b" 'bibtex-Book)
   (define-key bibtex-mode-map "\C-c\C-e\C-d" 'bibtex-DEAthesis)
@@ -459,9 +439,182 @@ non-nil."
         (t
          (backward-paragraph)
          (forward-paragraph)))
-  (re-search-forward "[ \t\n]*" (point-max) t)
-  (insert "\n")
-  (forward-char -1))
+  (re-search-forward "[ \t\n]*" (point-max) t))
+
+(defun ispell-abstract ()
+  (interactive)
+  (beginning-of-bibtex-entry)
+  (re-search-forward "^[ \t]*[OPT]*abstract[ \t]*=")
+  (ispell-region (point)
+                 (save-excursion (forward-sexp) (point))))
+
+(defun beginning-of-bibtex-entry ()
+  (interactive)
+  (re-search-backward "^@" nil 'move))
+
+(defun end-of-bibtex-entry ()
+  (interactive)
+  (re-search-forward "}$" nil 'move))
+  
+(defun ispell-bibtex-entry ()
+  (interactive)
+  (ispell-region (progn (beginning-of-bibtex-entry) (point))
+                 (progn (end-of-bibtex-entry) (point))))
+
+(defun narrow-to-bibtex-entry ()
+  (interactive)
+  (save-excursion
+    (narrow-to-region (progn (beginning-of-bibtex-entry) (point))
+                      (progn (end-of-bibtex-entry) (point)))))
+
+
+(defun beginning-of-first-bibtex-entry ()
+  (goto-char (point-min))
+  (cond
+   ((re-search-forward "^@" nil 'move)
+    (beginning-of-line))
+   ((and (bobp) (eobp))
+    nil)
+   (t
+    (message "Warning: No bibtex entries found!"))))
+
+(defun hide-bibtex-entry-bodies (&optional arg)
+  "Hide all lines between first and last bibtex entries not beginning with @.
+With argument, show all text."
+  (interactive "P")
+  (beginning-of-first-bibtex-entry)
+  ;; subst-char-in-region modifies the buffer, despite what the
+  ;; documentation says...
+  (let ((modifiedp (buffer-modified-p))
+        (buffer-read-only nil))
+    (if arg
+        (subst-char-in-region (point) (point-max) ?\r ?\n t)
+        (while (save-excursion (re-search-forward "\n[^@]" (point-max) t))
+          (save-excursion (replace-regexp "\n\\([^@]\\)" "\r\\1"))))
+    (setq selective-display (not arg))
+    (set-buffer-modified-p modifiedp)))
+
+(defun sort-bibtex-entries ()
+  "Sort bibtex entries alphabetically by key.
+Text before the first bibtex entry, and following the last is not effected.
+Bugs:
+  1. Text between the closing brace ending one bibtex entry, and the @ starting 
+     the next, is considered part of the PRECEEDING entry.  Perhaps it should be
+     part of the following entry."
+  (interactive)
+  (save-restriction
+    (beginning-of-first-bibtex-entry)
+    (narrow-to-region (point)
+                      (save-excursion
+                        (goto-char (point-max))
+                        (beginning-of-bibtex-entry)
+                        (end-of-bibtex-entry)
+                        (point)))
+    (sort-subr nil                      ; reversep
+               ;; begining of record function
+               'forward-line
+               ;; end of record function
+               (function (lambda () (and (re-search-forward "}[ \t]*\n[\n \t]*@" nil 'move)
+                                         (forward-char -2))))
+               ;; start of key function
+               (function (lambda () (re-search-forward "{[ \t]*") nil))
+               ;; end of key function
+               (function (lambda () (search-forward ",")))
+               )))
+  
+(defun map-bibtex-entries (fun)
+  "Call FUN for each bibtex entry starting with the current, to the end of the file.
+FUN is called with one argument, the key of the entry, and with point inside the entry."
+  (beginning-of-bibtex-entry)
+  (while (re-search-forward "^@[^{]*{[ \t]*\\([^,]*\\)" nil t)
+    (funcall fun (buffer-substring (match-beginning 1) (match-end 1)))))
+  
+(defun find-bibtex-entry-location (entry-name)
+  (interactive "sBibtex entry key: ")
+  "Searches from beginning of current buffer looking for place to put the
+bibtex entry named ENTRY-NAME.  Buffer is assumed to be in sorted order,
+without duplicates (see \\[sort-bibtex-entries]), if it is not, an error will
+be signalled."
+  (let ((previous nil)
+        point)
+    (beginning-of-first-bibtex-entry)
+    (or (catch 'done
+          (map-bibtex-entries (function (lambda (current)
+                                 (cond
+                                  ((string-equal entry-name current)
+                                   (error "Entry duplicates existing!"))
+                                  ((or (null previous)
+                                       (string< previous current))
+                                   (setq previous current
+                                         point (point))
+                                   (if (string< entry-name current)
+                                       (progn
+                                         (beginning-of-bibtex-entry)
+                                         ;; Many schemes append strings to
+                                         ;; existing entries to resolve them,
+                                         ;; so initial substring matches may
+                                         ;; indicate a duplicate entry.  
+                                         (let ((idx (string-match (regexp-quote entry-name) current)))
+                                           (if (and (integerp idx)
+                                                    (zerop idx))
+                                               (progn
+                                                 (message "Warning: Entry %s may be a duplicate of %s!"
+                                                          entry-name current)
+                                                 (ding t))))
+                                         (throw 'done t))))
+                                  ((string-equal previous current)
+                                   (error "Duplicate here with previous!"))
+                                  (t (error "Entries out of order here!")))))))
+        (end-of-bibtex-entry))))
+
+(defun validate-bibtex-buffer ()
+  "Find some typical errors in bibtex files.
+  1. At signs (@) not as first char of a line.
+  2. Double quotes (\") inside strings.
+  3. Closing braces (}) not the last character of a line."
+  (interactive)
+  (let ((point (point)))
+    (while (re-search-forward ".@" nil t)
+      (let* ((foo (parse-partial-sexp (save-excursion (beginning-of-bibtex-entry)
+                                                      (point))
+                                      (point)))
+             (in-a-string (nth 3 foo)))
+        (if (not in-a-string)
+            (error "At sign (@) out of place!"))))
+    (goto-char point)
+    (while (search-forward "\"" nil t)
+      (or (looking-at "[,}][ \t]*$")
+          ;; some versions put closing brace on separate line.
+          (looking-at "[ \t]*\n}")
+          (save-excursion
+            (save-restriction
+              (narrow-to-region (point)
+                                (progn (beginning-of-line) (point)))
+              (looking-at "^[ \t]*[a-zA-Z]+[ \t]*=[ \t]*\"$")))
+          (error "Quote out of place, or missing \",\" or \"}\"!")))
+    (goto-char point)
+    ;; This is only approximate, should actually search for close braces,
+    ;; then see if they are inside a string, or at the end of a line.
+    ;; This just gets the typical case of whitespace after a closing brace.
+    (while (search-forward "}[ \t]+$" nil t)
+      (error "Brace not last char of line!"))
+    (goto-char point)
+    (message "Bibtex buffer appears o.k.")))
+
+(defun find-bibtex-duplicates ()
+  "Searches forward in current buffer looking for duplicate bibtex entries.
+Buffer is assumed to be sorted, see \\[sort-bibtex-entries]"
+  (interactive)
+  (let ((point (point)))
+    ;; errors if things are not right...
+    (find-bibtex-entry-location (make-string 10 255))
+    (goto-char point)
+    (message "No duplicates found!")))
+
+
+(defvar bibtex-maintain-sorted-entries nil
+  "*If true, bibtex-mode will attempt to maintain all bibtex entries in 
+sorted order.")
 
 ;;
 ;; note: this should really take lists of strings OR of lists.  in the
@@ -470,58 +623,69 @@ non-nil."
 ;;
 
 (defun bibtex-entry (entry-type required optional)
-  (bibtex-move-outside-of-entry)
-  (insert "@" entry-type "{")
-  (mapcar 'bibtex-make-field required)
-  (if bibtex-include-OPTcrossref
-      (bibtex-make-optional-field "crossref"))
-  (if bibtex-include-OPTkey
-      (bibtex-make-optional-field "key"))
-  (mapcar 'bibtex-make-optional-field optional)
-  (if bibtex-mode-user-optional-fields          ;MON...
-      (mapcar 'bibtex-make-optional-field
-              bibtex-mode-user-optional-fields))
-  (if bibtex-include-OPTannote
-      (bibtex-make-optional-field "annote"))
-  (insert "\n}\n\n")
-  (forward-char -3)
-  (up-list -1)
-  (forward-char 1))  
-
-(defun bibtex-insert-field-delimeters (str)
-  "Insert double quotes (default) or, if STR is in the list
-bibtex-curly-delimeters, insert curly brackets."
-  (if (and (boundp 'bibtex-curly-delimeters)
-           bibtex-curly-delimeters
-           (memq (car (read-from-string (downcase str)))
-                 bibtex-curly-delimeters))
-      (insert "\{\}")
-    (insert "\"\"")))
+  (let (key)
+    (if bibtex-maintain-sorted-entries
+        (progn
+          (setq key (read-string (format "%s key: " entry-type)))
+          (find-bibtex-entry-location key)))
+    (bibtex-move-outside-of-entry)
+    (insert "@" entry-type "{")
+    (mapcar 'bibtex-make-field required)
+    (if bibtex-include-OPTcrossref
+        (bibtex-make-optional-field "crossref"))
+    (if bibtex-include-OPTkey
+        (bibtex-make-optional-field "key"))
+    (mapcar 'bibtex-make-optional-field optional)
+    (if bibtex-mode-user-optional-fields ;MON...
+        (mapcar 'bibtex-make-optional-field 
+                bibtex-mode-user-optional-fields))
+    (if bibtex-include-OPTannote
+        (bibtex-make-optional-field "annote"))
+    (insert "\n}\n\n")
+    (forward-char -3)
+    (up-list -1)
+    (forward-char 1)
+    (if key
+        (progn
+          (insert key)
+          (bibtex-next-field t)))))
+
+;; (defun bibtex-entry (entry-type required optional)
+;;   (bibtex-move-outside-of-entry)
+;;   (insert (concat "@" entry-type "{,\n\n}\n\n"))
+;;   (previous-line 3)
+;;   (insert (mapconcat 'bibtex-make-entry required ",\n"))
+;;   (if required
+;;       (if optional
+;;        (insert ",\n")))
+;;   (insert (mapconcat 'bibtex-make-OPT-entry optional ",\n"))
+;;   (if bibtex-mode-user-optional-fields               ;MON...
+;;       (progn
+;;      (if optional
+;;          (insert ",\n"))
+;;      (insert (mapconcat 'bibtex-make-OPT-entry
+;;                         bibtex-mode-user-optional-fields
+;;                         ",\n"))))            ;MON
+;;  (up-list -1)
+;;  (forward-char 1))
+
 
 (defun bibtex-make-field (str)
   (interactive "sBibTeX entry type: ")
   (insert ",\n")
-  (indent-to-column bibtex-name-alignment)
+  (indent-to-column bibtex-name-alignement)
   (insert str " = ")
   (indent-to-column bibtex-text-alignment)
-  (bibtex-insert-field-delimeters str)
+  (insert "\"\"")
   nil)
 
-;; modified to make fields align up _after_ the OPT's have been removed
-
 (defun bibtex-make-optional-field (str)
   (interactive "sOptional BibTeX entry type: ")
   (insert ",\n")
-  (indent-to-column bibtex-name-alignment)
-  (insert str " = ")
-  (indent-to-column bibtex-text-alignment)      ;align nicely, then,...
-  (bibtex-insert-field-delimeters str)
-  (if bibtex-use-OPT-prefix
-      (progn
-        (beginning-of-line)
-        (move-to-column bibtex-name-alignment)  ;go back to name and put in OPT
-        (insert "OPT")
-        (end-of-line)))
+  (indent-to-column bibtex-name-alignement)
+  (insert "OPT" str " = ")
+  (indent-to-column bibtex-text-alignment)
+  (insert "\"\"")
   nil)
 
 ;; What to do about crossref?  if present, journal and year are 
@@ -536,11 +700,12 @@ bibtex-curly-delimeters, insert curly brackets."
     (bibtex-entry "Article" '("author" "title" "journal" "year")
                   '("volume" "number" "pages" "month" "note"))))
 
+
 (defun bibtex-Book ()
   (interactive)
   (bibtex-entry "Book" '("author" "title" "publisher" "year")
-                '("editor" "volume" "number" "series" "address"
-                  "edition" "month" "note")))
+                '("editor" "volume" "number" "series" "address"
+                           "edition" "month" "note")))
 
 (defun bibtex-Booklet ()
   (interactive)
@@ -563,31 +728,31 @@ bibtex-curly-delimeters, insert curly brackets."
                   '("editor" "pages" "volume" "number" "series" "address"
                     "edition" "month" "type" "note"))))
 
-;; In next 2, for crossref case, put pages near beginning of 
-;; optionals as it will be used most often  -- MON
 (defun bibtex-InCollection ()
   (interactive)
   (if bibtex-include-OPTcrossref
       (bibtex-entry "InCollection" '("author" "title")
-                    '("pages" "booktitle" "publisher" "year"
+                    '("booktitle" "publisher" "year"
                       "editor" "volume" "number" "series" "type" "chapter"
-                      "address" "edition" "month" "note"))
+                      "pages" "address" "edition" "month" "note"))
     (bibtex-entry "InCollection" '("author" "title"
                                    "booktitle" "publisher" "year")
                   '("editor" "volume" "number" "series" "type" "chapter"
                     "pages" "address" "edition" "month" "note"))))
 
+
 (defun bibtex-InProceedings ()
   (interactive)
   (if bibtex-include-OPTcrossref
       (bibtex-entry "InProceedings" '("author" "title")
-                    '( "pages" "editor" "volume" "number" "series"
-                       "booktitle" "year"
-                       "organization" "publisher" "address" "month" "note"))
+                    '("editor" "volume" "number" "series" "pages"
+                      "booktitle" "year"
+                      "organization" "publisher" "address" "month" "note"))
     (bibtex-entry "InProceedings" '("author" "title" "booktitle" "year")
                   '("editor" "volume" "number" "series" "pages"
                     "organization" "publisher" "address" "month" "note"))))
 
+
 (defun bibtex-Manual ()
   (interactive)
   (bibtex-entry "Manual" '("title")
@@ -620,7 +785,6 @@ bibtex-curly-delimeters, insert curly brackets."
   (bibtex-entry "TechReport" '("author" "title" "institution" "year")
                 '("type" "number" "address" "month" "note")))
 
-
 (defun bibtex-Unpublished ()
   (interactive)
   (bibtex-entry "Unpublished" '("author" "title" "note")
@@ -656,6 +820,17 @@ bibtex-curly-delimeters, insert curly brackets."
        (forward-char 1))))
   (bibtex-find-text arg))
 
+;; (defun bibtex-next-field ()
+;;   "Finds end of text of next field."
+;;   (interactive)
+;;   (condition-case ()
+;;       (progn
+;;      (bibtex-inside-field)
+;;      (re-search-forward ",[ \t\n]*" (point-max) 1)
+;;      (bibtex-enclosing-field)
+;;      (bibtex-inside-field))
+;;     (error nil)))
+
 (defun bibtex-find-text (arg)
   "Go to end of text of current field; with arg, go to beginning."
   (interactive "P")
@@ -664,12 +839,23 @@ bibtex-curly-delimeters, insert curly brackets."
   (if arg
       (progn
         (goto-char (match-beginning bibtex-text-in-field))
-        (if (or (looking-at "\"") (looking-at "{"))
+        (if (looking-at "\"")
             (forward-char 1)))
     (goto-char (match-end bibtex-text-in-field))
-    (if (or (= (preceding-char) ?\") (= (preceding-char) ?}))
+    (if (= (preceding-char) ?\")
         (forward-char -1))))
 
+;; (defun bibtex-find-text ()
+;;   "Go to end of text of current field."
+;;   (interactive)
+;;   (condition-case ()
+;;       (progn
+;;      (bibtex-inside-field)
+;;      (bibtex-enclosing-field)
+;;      (goto-char (match-end bibtex-text-in-field))
+;;      (bibtex-inside-field))
+;;     (error nil)))
+
 (defun bibtex-remove-OPT ()
   "Removes the 'OPT' starting optional arguments and goes to end of text"
   (interactive)
@@ -685,12 +871,11 @@ bibtex-curly-delimeters, insert curly brackets."
   "Try to avoid point being at end of a bibtex field."
   (interactive)
   (end-of-line)
-  (skip-chars-backward " \t")           ;delete these chars? -- MON
+  (skip-chars-backward " \t")           ;MON - maybe delete these chars?
   (cond ((= (preceding-char) ?,)
          (forward-char -1)))
-  (cond ((or (= (preceding-char) ?\") (= (preceding-char) ?\}))
-         (forward-char -1))))           ;only go back if quote
-
+  (cond ((= (preceding-char) ?\")
+         (forward-char -1))))           ;MON - only go back if quote
 
 (defun bibtex-remove-double-quotes ()
   "Removes """" around string."
@@ -905,7 +1090,7 @@ an undefined location.
     (re-search-forward regexp right nil 1)
     (if (> (match-beginning 0) initial)
         (signal 'search-failed (list regexp)))    
-    (while (< (match-end 0) initial)            ;<= --> < -- MON
+    (while (<= (match-end 0) initial)
       (re-search-forward regexp right nil 1)
       (if (> (match-beginning 0) initial)
           (signal 'search-failed (list regexp))))
@@ -932,16 +1117,9 @@ an undefined location.
                   (looking-at "OPT")
                   bibtex-clean-entry-zap-empty-opts)
                  (goto-char begin-text)
-                 (if (and (looking-at "\"\"") ; empty: delete whole field
-                          (boundp 'bibtex-save-OPT)
-                          bibtex-save-OPT
-                          (not (memq (car (read-from-string
-                                           (buffer-substring
-                                            (+ begin-name 3)
-                                            end-name)))
-                                     bibtex-save-OPT)))
+                 (if (looking-at "\"\"") ; empty: delete whole field
                      (delete-region begin-field end-field)
-                   ;; otherwise: not empty, delete "OPT"
+                   ; otherwise: not empty, delete "OPT"
                    (goto-char begin-name)
                    (delete-char (length "OPT"))
                    (goto-char begin-field) ; and loop to go through next test
@@ -965,12 +1143,7 @@ an undefined location.
                                      (equal (buffer-substring
                                              begin-name
                                              (+ begin-name 3))
-                                            "opt")
-                                     (memq (car (read-from-string
-                                                 (buffer-substring
-                                                  begin-name
-                                                  end-name)))
-                                           bibtex-save-OPT)))
+                                            "opt")))
                             (error "Mandatory field ``%s'' is empty"
                                    (buffer-substring begin-name end-name))))
                        (t
@@ -1039,66 +1212,49 @@ an undefined location.
 ;; since we aren't interested.  See etc/SUN-SUPPORT for the reasons why
 ;; we consider this nothing but a distraction from our work.
 
-(if (fboundp 'defmenu)
-    (progn
-
-(defmenu bibtex-sun-entry-menu 
-  ("Article In Conf. Proc."
-   (lambda () (eval-in-window *menu-window* (bibtex-InProceedings))))
-  ("Article In Journal"
-   (lambda () (eval-in-window *menu-window* (bibtex-Article))))
-  ("Book"
-   (lambda () (eval-in-window *menu-window* (bibtex-Book))))
-  ("Booklet"
-   (lambda () (eval-in-window *menu-window* (bibtex-Booklet))))
-  ("Master's Thesis"
-   (lambda () (eval-in-window *menu-window* (bibtex-MastersThesis))))
-  ;;("DEA Thesis" bibtex-DEAthesis)
-  ("PhD. Thesis"
-   (lambda () (eval-in-window *menu-window* (bibtex-PhdThesis))))
-  ("Technical Report"
-   (lambda () (eval-in-window *menu-window* (bibtex-TechReport))))
-  ("Technical Manual"
-   (lambda () (eval-in-window *menu-window* (bibtex-Manual))))
-  ("Conference Proceedings"
-   (lambda () (eval-in-window *menu-window* (bibtex-Proceedings))))
-  ("In A Book"
-   (lambda () (eval-in-window *menu-window* (bibtex-InBook))))
-  ("In A Collection"
-   (lambda () (eval-in-window *menu-window* (bibtex-InCollection))))
-  ("Miscellaneous"
-   (lambda () (eval-in-window *menu-window* (bibtex-Misc))))
-  ("Unpublished"
-   (lambda () (eval-in-window *menu-window* (bibtex-Unpublished)))))
-
-(defmenu bibtex-sun-menu
-  ("BibTeX menu")
-  ("add entry" . bibtex-sun-entry-menu)
-  ("add string"
-   (lambda () (eval-in-window *menu-window* (bibtex-string))))
-  ;("next field" bibtex-next-position)
-  ;("to end of field" bibtex-find-it)
-;  ("remove OPT"
-;   (lambda () (eval-in-window *menu-window* (bibtex-remove-opt))))
-;  ("remove quotes"
-;   (lambda () (eval-in-window *menu-window* (bibtex-remove-double-quotes))))
-;  ("remove this line"
-;   (lambda () (eval-in-window *menu-window* (kill-current-line))))
-  ("describe BibTeX mode"
-   (lambda () (eval-in-window *menu-window* (describe-mode))))
-  ("Main Emacs menu" . emacs-menu))
+(defmacro eval-in-menu-window (&rest l)
+  "Evaluates its argument in the window in which the mouse button was pressed."
+  (list 'eval-in-window '*menu-window* l))
+
+;(defmenu bibtex-sun-entry-menu 
+;  ("Article In Conf. Proc." eval-in-menu-window bibtex-InProceedings)
+;  ("Article In Journal" eval-in-menu-window bibtex-Article)
+;  ("Book" eval-in-menu-window bibtex-Book)
+;  ("Booklet" eval-in-menu-window bibtex-Booklet)
+;  ("Master's Thesis" eval-in-menu-window bibtex-MastersThesis)
+;  ("PhD. Thesis" eval-in-menu-window bibtex-PhdThesis)
+;  ("Technical Report" eval-in-menu-window bibtex-TechReport)
+;  ("Technical Manual" eval-in-menu-window bibtex-Manual)
+;  ("Conference Proceedings" eval-in-menu-window bibtex-Proceedings)
+;  ("In A Book" eval-in-menu-window bibtex-InBook)
+;  ("In A Collection" eval-in-menu-window bibtex-InCollection)
+;  ("Miscellaneous" eval-in-menu-window bibtex-Misc)
+;  ("Unpublished" eval-in-menu-window bibtex-Unpublished)
+;  ("string" eval-in-menu-window bibtex-string)
+;  ("preamble" eval-in-menu-window bibtex-preamble))
+;
+;(defmenu bibtex-sun-menu
+;  ("BibTeX menu")
+;  ("add entry" . bibtex-sun-entry-menu)
+;  ("next field" eval-in-menu-window bibtex-next-field nil)
+;  ("to end of field" eval-in-menu-window bibtex-find-text nil)
+;  ("snatch similar preceding field" eval-in-menu-window bibtex-pop-previous 1)
+;  ("snatch similar following field" eval-in-menu-window bibtex-pop-next 1)
+;  ("remove OPT" eval-in-menu-window bibtex-remove-OPT)
+;  ("remove quotes" eval-in-menu-window bibtex-remove-double-quotes)
+;  ("clean entry" eval-in-menu-window bibtex-clean-entry)
+;  ("describe BibTeX mode" eval-in-menu-window describe-mode)
+;  ("Main Emacs menu" . emacs-menu))
  
 (defun bibtex-sun-menu-eval (window x y)
   "Pop-up menu of BibTeX commands."
   (sun-menu-evaluate window (1+ x) (1- y) 'bibtex-sun-menu))
 
 (defun bibtex-sun-environment ()
-  "Set up sun menus for BibTeX mode.  Call it as bibtex-mode-hook, or interactively"
+  "Set up sun menus for BibTeX mode.  Call it as bibtex-mode-hook, or
+interactively"
   (interactive)
   (local-set-mouse  '(text right) 'bibtex-sun-menu-eval))
 
-))  ; matches (if...
-
-(provide 'bibtex)
+;;; bibtex-mode.el ends here
 
-;;; bibtex.el ends here
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index e4e02a68f67..85a9c1dd2e4 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -1,12 +1,15 @@
 ;;; fill.el --- fill commands for Emacs
 
+;; Maintainer: FSF
+;; Last-Modified: 24 Jun 1992
+
 ;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (defconst fill-individual-varying-indent nil
   "*Controls criterion for a new paragraph in `fill-individual-paragraphs'.
diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index 26d82a2f793..b05632c569e 100644
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -1,7 +1,7 @@
 ;;; nroff-mode.el --- GNU Emacs major mode for editing nroff source
 
 ;; Maintainer: FSF
-;; Last-Modified: 9 May 1991
+;; Last-Modified: 09 May 1991
 
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
@@ -9,7 +9,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/textmodes/ooutline.el b/lisp/textmodes/ooutline.el
index ad7512d6cf7..036e5d6bb63 100644
--- a/lisp/textmodes/ooutline.el
+++ b/lisp/textmodes/ooutline.el
@@ -1,12 +1,15 @@
 ;;; outline.el --- outline mode commands for Emacs
 
+;; Maintainer: FSF
+;; Last-Modified: 10 Apr 1991
+
 ;; Copyright (C) 1986 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 ;; Jan '86, Some new features added by Peter Desnoyers and rewritten by RMS.
   
 (defvar outline-regexp "[*\^l]+"
diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el
index c5457fa5e5d..53953cb65be 100644
--- a/lisp/textmodes/page-ext.el
+++ b/lisp/textmodes/page-ext.el
@@ -1,18 +1,15 @@
 ;;; page-ext.el --- page handling commands
 
-;;; by Robert J. Chassell
-
-;;; You may use these commands to handle an address list or other
-;;; small data base.
+;; Author: Robert J. Chassell <bob@gnu.ai.mit.edu>
+;; Last-Modified: 10 Apr 1991
 
 ;;; Copyright (C) 1990 Free Software Foundation
-;;; Please send bug reports to bob@ai.mit.edu
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -24,6 +21,13 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
+;;; You may use these commands to handle an address list or other
+;;; small data base.
+
+;;; Change Log:
+
 ;;; Change Log ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
 ;;; Version 0.043
@@ -132,6 +136,7 @@
 ;;; 28 Jan 1990 - Initial definitions.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+;;; Code:
 
 ;;;; Summary
 
diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el
index 935e19bdba4..65cad14e6ed 100644
--- a/lisp/textmodes/page.el
+++ b/lisp/textmodes/page.el
@@ -1,12 +1,15 @@
 ;;; page.el --- page motion commands for emacs.
 
+;; Maintainer: FSF
+;; Last-Modified: 01 May 1992
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (defun forward-page (&optional count)
   "Move forward to page boundary.  With arg, repeat, or go back if negative.
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index 516ccd646de..dd0e941c195 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -1,13 +1,16 @@
 ;;; picture.el --- "Picture mode" -- editing using quarter-plane screen model.
 
+;; Author: K. Shane Hartman
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
-;; Principal author K. Shane Hartman
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,6 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (defun move-to-column-force (column)
   "Move to column COLUMN in current line.
diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el
index e0eb0614d70..a769877118d 100644
--- a/lisp/textmodes/refbib.el
+++ b/lisp/textmodes/refbib.el
@@ -1,12 +1,15 @@
 ;;; refbib.el --- convert refer-style references to ones usable by Latex bib
 
+;; Maintainer: FSF
+;; Last-Modified: 16 Mar 1992
+
 ;; Copyright (C) 1989 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,11 +21,15 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
 ;; Use: from a buffer containing the refer-style bibliography,
 ;;   M-x r2b-convert-buffer
 ;; Program will prompt for an output buffer name, and will log
 ;; warnings during the conversion process in the buffer *Log*.
 
+;;; Change Log:
+
 ; HISTORY
 ; 9/88, created
 ; modified 1/19/89, allow books with editor but no author;
@@ -45,6 +52,9 @@
 ; modified 3/1/89,  fixed capitialize-title for first words all caps
 ; modified 3/15/89, allow use of " to delimit fields
 ; modified 4/18/89, properly "quote" special characters on output
+
+;;; Code:
+
 ;**********************************************************
 ; User Parameters
 
diff --git a/lisp/textmodes/spell.el b/lisp/textmodes/spell.el
index 63ef847b018..b9033e13dac 100644
--- a/lisp/textmodes/spell.el
+++ b/lisp/textmodes/spell.el
@@ -1,7 +1,7 @@
 ;;; spell.el --- spelling correction interface for Emacs.
 
 ;; Maintainer: FSF
-;; Last-Modified: 9 May 1991
+;; Last-Modified: 09 May 1991
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
@@ -9,7 +9,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 545fcd34def..9b6fee482a5 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1,16 +1,18 @@
 ;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands.
 
-;; Copyright (C) 1985, 1986, 1989, 1992 Free Software Foundation, Inc.
+;; Maintainer: Edward M. Reingold <reingold@cs.uiuc.edu>
+;; Last-Modified: 04 July 1992
+
 ;; Contributions over the years by William F. Schelter, Dick King,
 ;; Stephen Gildea, Michael Prange, and Edward M. Reingold.
 
-;; Latest revision (1992) by Edward M. Reingold <reingold@cs.uiuc.edu>.
+;; Copyright (C) 1985, 1986, 1989, 1992 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -22,6 +24,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 (require 'comint)
 
 (defvar tex-shell-file-name nil
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index f23ffbba7aa..1c35f4c46e4 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -1,6 +1,8 @@
 ;;;; texinfmt.el --- convert Texinfo files to Info files.
 
-;;;; Version 2.00   14 Dec 1990
+;; Author: Robert J. Chassell <bob@gnu.ai.mit.edu>
+;; Version: 2.00
+;; Last-Modified: 14 Dec 1990
 
 ;; Copyright (C) 1985, 1986, 1988, 1990 Free Software Foundation, Inc.
 
@@ -8,7 +10,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -20,12 +22,16 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
 ;; Updated May 1990 to correspond, more or less, to version 2.8 of
 ;; texinfo.tex.  NOTE: texinfmt.el is being phased out; it is being
 ;; replaced by makeinfo.c, which is faster and provides better error
 ;; checking.  
 ;; Robert J. Chassell, bob@ai.mit.edu
 
+;;; Code:
+
 (defvar texinfo-format-syntax-table nil)
 
 (defvar texinfo-vindex)
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 76cbc5b2a2b..837dd3e3a2f 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -1,6 +1,8 @@
 ;;;; texinfo.el ---- major mode for editing Texinfo files.
 
-;;;; Version 2.00   14 Dec 1990
+;; Author: Bob Chassell <bob@gnu.ai.mit.edu>
+;; Version: 2.00
+;; Last-Modified: 14 Dec 1990
 
 ;; Copyright (C) 1985, 1988, 1989, 1990 Free Software Foundation, Inc.
 
@@ -8,7 +10,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -20,6 +22,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 (require 'texnfo-upd)
 (require 'tex-mode)
 (defvar texinfo-mode-syntax-table nil)
diff --git a/lisp/textmodes/underline.el b/lisp/textmodes/underline.el
index da341b2ab9c..b30f897586c 100644
--- a/lisp/textmodes/underline.el
+++ b/lisp/textmodes/underline.el
@@ -1,12 +1,15 @@
 ;;; underline.el --- insert/remove underlining (done by overstriking) in Emacs.
 
+;; Maintainer: FSF
+;; Last-Modified: 30 May 1988
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ;;;###autoload
 (defun underline-region (start end)
diff --git a/lisp/time.el b/lisp/time.el
index 2978b812cdb..11ab1cd524a 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -1,12 +1,15 @@
 ;;; time.el --- display time and load in mode line of Emacs.
 
+;; Maintainer: FSF
+;; Last-Modified: 09 Oct 1990
+
 ;; Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (defvar display-time-mail-file nil
   "*File name of mail inbox file, for indicating existence of new mail.
diff --git a/lisp/timer.el b/lisp/timer.el
index b938307aea6..cbe3b2a0478 100644
--- a/lisp/timer.el
+++ b/lisp/timer.el
@@ -1,12 +1,15 @@
 ;;; timer.el --- run a function with args at some time in future
 
+;; Maintainer: FSF
+;; Last-Modified: 19 Jan 1990
+
 ;; Copyright (C) 1990 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 (defvar timer-process nil)
 (defvar timer-alist ())
 (defvar timer-out "")
diff --git a/lisp/uncompress.el b/lisp/uncompress.el
index fd450ac36f0..b918c5b1fd8 100644
--- a/lisp/uncompress.el
+++ b/lisp/uncompress.el
@@ -1,12 +1,15 @@
 ;;; uncompress.el --- auto-decompression hook for visiting .Z files
 
+;; Maintainer: FSF
+;; Last-Modified: 30 May 1988
+
 ;; Copyright (C) 1992 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 ;; When we are about to make a backup file,
 ;; uncompress the file we visited
 ;; so that making the backup can work properly.
diff --git a/lisp/userlock.el b/lisp/userlock.el
index 23430fa1e04..cce5251204b 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -1,12 +1,15 @@
 ;;; userlock.el --- handle file access contention between multiple users
 
+;;; Maintainer: FSF
+;;; Last-Modified: 26 May 1987
+
 ;; Copyright (C) 1985, 1986 Free Software Foundation, inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,12 +21,14 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
 
-;; This file is autloaded to handle certain conditions
+;; This file is autoloaded to handle certain conditions
 ;; detected by the file-locking code within Emacs.
 ;; The two entry points are `ask-user-about-lock' and
 ;; `ask-user-about-supersession-threat'.
 
+;;; Code:
 
 (put 'file-locked 'error-conditions '(file-locked file-error error))
 
diff --git a/lisp/view.el b/lisp/view.el
index 8bb69bff6fd..d93c9b50cf8 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -1,13 +1,16 @@
 ;;; view.el --- peruse file or buffer without editing.
 
+;; Author: K. Shane Hartman
+;; Maintainer: FSF
+;; Last-Modified: 21 Aug 1988
+
 ;; Copyright (C) 1985, 1989 Free Software Foundation, Inc.
-;; Principal author K. Shane Hartman
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,6 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (defvar view-mode-map nil)
 (if view-mode-map
diff --git a/lisp/vms-patch.el b/lisp/vms-patch.el
index 48ecbeb61de..6abdb38591d 100644
--- a/lisp/vms-patch.el
+++ b/lisp/vms-patch.el
@@ -1,12 +1,15 @@
 ;;; vms-patch.el --- override parts of files.el for VMS.
 
+;; Maintainer: FSF
+;; Last-Modified: 06 May 1992
+
 ;; Copyright (C) 1986 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 ;;; Functions that need redefinition
 
diff --git a/lisp/vmsproc.el b/lisp/vmsproc.el
index efd1482e1c0..bf561ad5205 100644
--- a/lisp/vmsproc.el
+++ b/lisp/vmsproc.el
@@ -1,4 +1,8 @@
-;; vmsproc.el --- run asynchronous VMS subprocesses under Emacs
+;;; vmsproc.el --- run asynchronous VMS subprocesses under Emacs
+
+;; Author: Mukesh Prasad
+;; Maintainer: FSF
+;; Last-Modified: 29 Sep 1986
 
 ;; Copyright (C) 1986 Free Software Foundation, Inc.
 
@@ -6,7 +10,7 @@
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,7 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-;; Written by Mukesh Prasad.
+;;; Code:
 
 (defvar display-subprocess-window nil
   "If non-nil, the suprocess window is displayed whenever input is received.")
diff --git a/lisp/vmsx.el b/lisp/vmsx.el
index 2d7fc89af7f..dc39efe4f67 100644
--- a/lisp/vmsx.el
+++ b/lisp/vmsx.el
@@ -1,12 +1,16 @@
 ;;; vmsx.el --- run asynchronous VMS subprocesses under Emacs
 
+;; Author: Mukesh Prasad
+;; Maintainer: FSF
+;; Last-Modified: 29 Sep 1986
+
 ;; Copyright (C) 1986 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,7 +22,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-;; Written by Mukesh Prasad.
+;;; Code:
 
 (defvar display-subprocess-window nil
   "If non-nil, the suprocess window is displayed whenever input is received.")
diff --git a/lisp/vt100-led.el b/lisp/vt100-led.el
index 2a096a7311b..b2bda4cd49d 100644
--- a/lisp/vt100-led.el
+++ b/lisp/vt100-led.el
@@ -1,12 +1,15 @@
 ;;; vt100-led.el --- functions for LED control on VT-100 terminals & clones.
 
+;; Author: Howard Gayle
+;; Maintainer: FSF
+
 ;; Copyright (C) 1988 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,8 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-
-;; Written by Howard Gayle.
+;;; Code:
 
 (defvar led-state (make-vector 5 nil)
    "The internal state of the LEDs.  Choices are nil, t, `flash.
diff --git a/lisp/xscheme.el b/lisp/xscheme.el
index 87ef6d6c668..fe45757d47e 100644
--- a/lisp/xscheme.el
+++ b/lisp/xscheme.el
@@ -3,13 +3,15 @@
 ;; Maintainer: FSF
 ;; Last-Modified: 21 Jan 1987
 
+;;; $Header: xscheme.el,v 1.26 90/09/11 01:51:20 GMT cph Exp $
+
 ;; Copyright (C) 1986, 1987, 1989, 1990 Free Software Foundation, Inc.
 
 ;; 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
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -28,8 +30,6 @@
 
 ;;; Code:
 
-;;; $Header: xscheme.el,v 1.26 90/09/11 01:51:20 GMT cph Exp $
-
 (require 'scheme)
 
 (defvar scheme-program-name "scheme"