11 files changed, 37 insertions, 8 deletions
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index cdc5785c35e..c1740717e69 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -2,6 +2,7 @@
 
 ;; Author: Roland McGrath <roland@gnu.ai.mit.edu>
 ;; Last-Modified: 24 Jun 1992
+;; Keyword: internal
 
 ;;; Copyright (C) 1991, 1992 Free Software Foundation, Inc.
 ;;;
diff --git a/lisp/emacs-lisp/backquote.el b/lisp/emacs-lisp/backquote.el
index bff397e3d74..1a7fe425ea0 100644
--- a/lisp/emacs-lisp/backquote.el
+++ b/lisp/emacs-lisp/backquote.el
@@ -2,6 +2,7 @@
 
 ;; Author: Dick King (king@kestrel).
 ;; Last-Modified: 16 Mar 1992
+;; Keywords: extensions
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index d27e29d7e07..f2654a7141d 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -3,6 +3,7 @@
 ;; Author: Richard Mlynark <mly@eddie.mit.edu>
 ;; Maintainer: FSF
 ;; Last-Modified: 09 May 1991
+;; Keywords: lisp, tools
 
 ;; Copyright (C) 1987 Free Software Foundation, Inc.
 ;; Written by Richard Mlynarik July 1987
diff --git a/lisp/emacs-lisp/cust-print.el b/lisp/emacs-lisp/cust-print.el
index 767119fa9c4..f4d46185e67 100644
--- a/lisp/emacs-lisp/cust-print.el
+++ b/lisp/emacs-lisp/cust-print.el
@@ -1,9 +1,10 @@
-;; cus-print.el -- handles print-level and print-circle.
+;; cust-print.el -- handles print-level and print-circle.
 
 ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
 ;; Version: 1.0
 ;; Last-Modified: 17 Mar 1992
 ;; Adapted-By: ESR
+;; Keyword: extensions
 
 ;; Copyright (C) 1992 Free Software Foundation, Inc.
 
@@ -569,4 +570,4 @@ Otherwise, print normally."
  (uninstall-custom-print-funcs)
  )
 
-;;; cus-print.el ends here
+;;; cust-print.el ends here
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index f3378c5f01d..07fe87adbdd 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 08 Jan 1992
+;; Keyword: lisp, tools
 
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el
index b06171b52ec..f2527584a93 100644
--- a/lisp/emacs-lisp/disass.el
+++ b/lisp/emacs-lisp/disass.el
@@ -1,9 +1,12 @@
-;;; Disassembler for compiled Emacs Lisp code
+;;; disass.el --- disassembler for compiled Emacs Lisp code
+
+;; Author: Doug Cutting <doug@csli.stanford.edu>
+;;	Jamie Zawinski <jwz@lucid.com>
+;; Maintainer: Jamie Zawinski <jwz@lucid.com>
+;; Last-Modified: 22 Oct 91
+;; Keyword: internal
+
 ;;; Copyright (C) 1986, 1991 Free Software Foundation, Inc.
-;;; Original version by Doug Cutting (doug@csli.stanford.edu)
-;;; Substantially modified by Jamie Zawinski <jwz@lucid.com> for
-;;; the new lapcode-based byte compiler.
-;;; Last modified 22-oct-91.
 
 ;; This file is part of GNU Emacs.
 
@@ -21,6 +24,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:
+
+;;; Original version by Doug Cutting (doug@csli.stanford.edu)
+;;; Substantially modified by Jamie Zawinski <jwz@lucid.com> for
+;;; the new lapcode-based byte compiler.
+
+;;; Code:
 
 ;;; The variable byte-code-vector is defined by the new bytecomp.el.
 ;;; The function byte-decompile-lapcode is defined in byte-opt.el.
@@ -223,3 +233,5 @@ OBJ should be a call to BYTE-CODE generated by the byte compiler."
 	  (insert "\n"))
 	(setq lap (cdr lap)))))
   nil)
+
+;;; disass.el ends here
diff --git a/lisp/emacs-lisp/float.el b/lisp/emacs-lisp/float.el
index 85d9b4db78c..400d87ad360 100644
--- a/lisp/emacs-lisp/float.el
+++ b/lisp/emacs-lisp/float.el
@@ -3,6 +3,7 @@
 ;; Author: Bill Rosenblatt
 ;; Maintainer: FSF
 ;; Last-Modified: 16 Mar 1992
+;; Keywords: extensions
 
 ;; Copyright (C) 1986 Free Software Foundation, Inc.
 
diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el
index cf9b2899319..6f513099aee 100644
--- a/lisp/emacs-lisp/helper.el
+++ b/lisp/emacs-lisp/helper.el
@@ -3,6 +3,7 @@
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
 ;; Last-Modified: 16 Mar 1991
+;; Keywords: help
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 9314d0b51fb..2ffe6cfb6b1 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 03 Jun 1992
+;; Keywords: lisp, languages
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index feedaa56077..5d23d10786a 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 12 Mar 1992
+;; Keyword: lisp, languages
 
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el
index 4b134801984..066b3b6b64a 100644
--- a/lisp/emacs-lisp/ring.el
+++ b/lisp/emacs-lisp/ring.el
@@ -1,12 +1,16 @@
 ;;; ring.el --- handle rings of marks
 
+;; Maintainer: FSF
+;; Last-Modified: 22 Apr 1991
+;; Keywords: extensions
+
 ;; 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 +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:
+
 ;;; This code defines a ring data structure. A ring is a 
 ;;;     (hd-index tl-index . vector) 
 ;;; list. You can insert to, remove from, and rotate a ring. When the ring
@@ -29,6 +35,8 @@
 ;;; These functions are used by the input history mechanism, but they can
 ;;; be used for other purposes as well.
 
+;;; Code:
+
 (provide 'history)
 
 (defun ring-p (x)