*** empty log message ***

65 files changed, 199 insertions, 124 deletions

diff --git a/lisp/add-log.el b/lisp/add-log.el
index ad2e1d73ad9..fe8dfcb37ba 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -1,5 +1,7 @@
 ;;; add-log.el --- change log maintenance commands for Emacs
 
+;; Maintainer: FSF
+
 ;; Copyright (C) 1985, 86, 87, 88, 89, 90, 91, 1992
 ;;      Free Software Foundation, Inc.
 
@@ -7,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,
@@ -19,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
 (defvar change-log-default-name nil
@@ -169,12 +172,16 @@ Interactively, with a prefix argument, the file name is prompted for."
 
 (defun change-log-mode ()
   "Major mode for editting change logs; like Indented Text Mode.
+Prevents numeric backups and sets `left-margin' to 8 and `fill-column'
+to 74.
 New log entries are usually made with \\[add-change-log-entry]."
   (interactive)
   (kill-all-local-variables)
   (indented-text-mode)
   (setq major-mode 'change-log-mode)
   (setq mode-name "Change Log")
+  (setq left-margin 8)
+  (setq fill-column 74)
   ;; Let each entry behave as one paragraph:
   (set (make-local-variable 'paragraph-start) "^\\s *$\\|^^L")
   (set (make-local-variable 'paragraph-separate) "^\\s *$\\|^^L\\|^\\sw")
@@ -248,3 +255,5 @@ Has a preference of looking backwards."
                                      t)
                  (buffer-substring (match-beginning 1)
                                    (match-end 1))))))))
+
+;;; add-log.el ends here
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 987ef12489b..f92352885ac 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -2,6 +2,7 @@
 
 ;; Author: Joe Wells <jbw@bigbird.bu.edu>
 ;; Last-Modified: 5 May 1989
+;; Keyword: help
 
 ;; Copyright (C) 1989 Free Software Foundation, Inc.
 
diff --git a/lisp/array.el b/lisp/array.el
index ad7d6c54443..17190b35bc3 100644
--- a/lisp/array.el
+++ b/lisp/array.el
@@ -3,6 +3,7 @@
 ;; Author David M. Brown
 ;; Maintainer: FSF
 ;; Last-Modified: 30 Jan 1991
+;; Keyword: extensions
 
 ;; Copyright (C) 1987 Free Software Foundation, Inc.
 
diff --git a/lisp/byte-run.el b/lisp/byte-run.el
index 05063058b1e..785a89b977d 100644
--- a/lisp/byte-run.el
+++ b/lisp/byte-run.el
@@ -1,29 +1,17 @@
-;;; -*- Mode:Emacs-Lisp -*-
-
-;; Runtime support for the new optimizing byte compiler.  
-;; By Jamie Zawinski <jwz@lucid.com>.
-;; Last Modified: 27-jul-91.
-;;
-;; The code in this file should always be loaded, because it defines things 
-;; like "defsubst" which should work interpreted as well.  The code in 
-;; bytecomp.el and byte-optimize.el can be loaded as needed.
-;;
-;; This should be loaded by loadup.el or startup.el.  If you can't modify
-;; those files, load this from your .emacs file.  But if you are using
-;; emacs18, this file must be loaded before any .elc files which were
-;; generated by the new compiler without emacs18 compatibility turned on.
-;; If this file is loaded, certain emacs19 binaries will run in emacs18.
-;; Meditate on the meanings of byte-compile-generate-emacs19-bytecodes and
-;; byte-compile-emacs18-compatibility.
-
-
-;; Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc.
+;; byte-run.el --- byte-compiler support for inlining
+
+;; Author: Jamie Zawinski <jwz@lucid.com>
+;;      Hallvard Furuseth <hbf@ulrik.uio.no>
+;; Last-Modified: 13 Jul 1992
+;; Keywords: internal
+
+;; 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,
@@ -35,81 +23,62 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-
-;; emacs-18 compatibility.
-
-(if (fboundp 'make-byte-code)
-    nil
-  ;;
-  ;; To avoid compiler bootstrapping problems, this temporary uncompiled
-  ;; make-byte-code is needed to load the compiled one.  Ignore the warnings.
-  (fset 'make-byte-code
-        '(lambda (arglist bytestring constants stackdepth doc)
-           (list 'lambda arglist doc
-                 (list 'byte-code bytestring constants stackdepth))))
-  ;;
-  ;; Now get a compiled version.
-  (defun make-byte-code (arglist bytestring constants stackdepth
-                                 &optional doc &rest interactive)
-    "For compatibility with Emacs19 ``.elc'' files."
-    (nconc (list 'lambda arglist)
-           ;; #### Removed the (stringp doc) for speed.  Because the V19
-           ;;   make-byte-code depends on the args being correct, it won't
-           ;;   help to make a smarter version for V18 alone.
-           ;;   Btw, it should have been (or (stringp doc) (natnump doc)).  
-           (if doc (list doc))
-           (if interactive
-               (list (cons 'interactive (if (car interactive) interactive))))
-           (list (list 'byte-code bytestring constants stackdepth)))))
-
+;;; Commentary:
 
 ;;; interface to selectively inlining functions.
 ;;; This only happens when source-code optimization is turned on.
 
+;;; Code:
+
 ;; Redefined in byte-optimize.el.
+;; This is not documented--it's not clear that we should promote it.
 (fset 'inline 'progn)
 (put 'inline 'lisp-indent-hook 0)
 
 
 ;;; Interface to inline functions.
 
-(defmacro proclaim-inline (&rest fns)
-  "Cause the named functions to be open-coded when called from compiled code.
-They will only be compiled open-coded when byte-compile-optimize is true."
-  (cons 'eval-and-compile
-        (mapcar '(lambda (x)
-                   (or (memq (get x 'byte-optimizer)
-                             '(nil byte-compile-inline-expand))
-                       (error
-                        "%s already has a byte-optimizer, can't make it inline"
-                        x))
-                   (list 'put (list 'quote x)
-                         ''byte-optimizer ''byte-compile-inline-expand))
-                fns)))
-
-
-(defmacro proclaim-notinline (&rest fns)
-  "Cause the named functions to no longer be open-coded."
-  (cons 'eval-and-compile
-        (mapcar '(lambda (x)
-                   (if (eq (get x 'byte-optimizer) 'byte-compile-inline-expand)
-                       (put x 'byte-optimizer nil))
-                   (list 'if (list 'eq (list 'get (list 'quote x) ''byte-optimizer)
-                                   ''byte-compile-inline-expand)
-                         (list 'put x ''byte-optimizer nil)))
-                fns)))
+;; (defmacro proclaim-inline (&rest fns)
+;;   "Cause the named functions to be open-coded when called from compiled code.
+;; They will only be compiled open-coded when byte-compile-optimize is true."
+;;   (cons 'eval-and-compile
+;;      (mapcar '(lambda (x)
+;;                 (or (memq (get x 'byte-optimizer)
+;;                           '(nil byte-compile-inline-expand))
+;;                     (error
+;;                      "%s already has a byte-optimizer, can't make it inline"
+;;                      x))
+;;                 (list 'put (list 'quote x)
+;;                       ''byte-optimizer ''byte-compile-inline-expand))
+;;              fns)))
+
+;; (defmacro proclaim-notinline (&rest fns)
+;;   "Cause the named functions to no longer be open-coded."
+;;   (cons 'eval-and-compile
+;;      (mapcar '(lambda (x)
+;;                 (if (eq (get x 'byte-optimizer) 'byte-compile-inline-expand)
+;;                     (put x 'byte-optimizer nil))
+;;                 (list 'if (list 'eq (list 'get (list 'quote x) ''byte-optimizer)
+;;                                 ''byte-compile-inline-expand)
+;;                       (list 'put x ''byte-optimizer nil)))
+;;              fns)))
 
 ;; This has a special byte-hunk-handler in bytecomp.el.
 (defmacro defsubst (name arglist &rest body)
-  "Same syntax as defun, but the defined function will always be open-coded,
-so long as byte-compile-optimize is true."
+  "Define an inline function.  The syntax is just like that of `defun'."
+  (or (memq (get name 'byte-optimizer)
+            '(nil byte-compile-inline-expand))
+      (error "`%s' is a primitive" name))
   (list 'prog1
         (cons 'defun (cons name (cons arglist body)))
-        (list 'proclaim-inline name)))
+        (list 'eval-and-compile
+              (list 'put (list 'quote name)
+                    ''byte-optimizer ''byte-compile-inline-expand))))
 
 (defun make-obsolete (fn new)
-  "Make the byte-compiler warn that FUNCTION is obsolete and NEW should be
-used instead.  If NEW is a string, that is the `use instead' message."
+  "Make the byte-compiler warn that FUNCTION is obsolete.
+The warning will say that NEW should be used instead.
+If NEW is a string, that is the `use instead' message."
   (interactive "aMake function obsolete: \nxObsoletion replacement: ")
   (let ((handler (get fn 'byte-compile)))
     (if (eq 'byte-compile-obsolete handler)
@@ -120,7 +89,7 @@ used instead.  If NEW is a string, that is the `use instead' message."
 
 (put 'dont-compile 'lisp-indent-hook 0)
 (defmacro dont-compile (&rest body)
-  "Like progn, but the body will always run interpreted (not compiled)."
+  "Like `progn', but the body always runs interpreted (not compiled)."
   (list 'eval (list 'quote (if (cdr body) (cons 'progn body) (car body)))))
 
 
@@ -131,43 +100,48 @@ used instead.  If NEW is a string, that is the `use instead' message."
 
 (put 'eval-when-compile 'lisp-indent-hook 0)
 (defmacro eval-when-compile (&rest body)
-  "Like progn, but evaluates the body at compile-time.  The result of the
-body appears to the compiler as a quoted constant."
+  "Like `progn', but evaluates the body at compile time.
+The result of the body appears to the compiler as a quoted constant."
   ;; Not necessary because we have it in b-c-initial-macro-environment
   ;; (list 'quote (eval (cons 'progn body)))
   (cons 'progn body))
 
 (put 'eval-and-compile 'lisp-indent-hook 0)
 (defmacro eval-and-compile (&rest body)
-  "Like progn, but evaluates the body at compile-time as well as at load-time."
+  "Like `progn', but evaluates the body at compile time and at load time."
   ;; Remember, it's magic.
   (cons 'progn body))
 
 
-;;; Interface to file-local byte-compiler parameters.
-;;; Redefined in bytecomp.el.
-
-(put 'byte-compiler-options 'lisp-indent-hook 0)
-(defmacro byte-compiler-options (&rest args)
-  "Set some compilation-parameters for this file.  This will affect only the
-file in which it appears; this does nothing when evaluated, and when loaded
-from a .el file.
-
-Each argument to this macro must be a list of a key and a value.
-
-  Keys:           Values:               Corresponding variable:
-
-  verbose         t, nil                byte-compile-verbose
-  optimize        t, nil, source, byte  byte-compile-optimize
-  warnings        list of warnings      byte-compile-warnings
-                      Legal elements: (callargs redefine free-vars unresolved)
-  file-format     emacs18, emacs19      byte-compile-emacs18-compatibility
-  new-bytecodes   t, nil                byte-compile-generate-emacs19-bytecodes
-
-For example, this might appear at the top of a source file:
-
-    (byte-compiler-options
-      (optimize t)
-      (warnings (- free-vars))          ; Don't warn about free variables
-      (file-format emacs19))"
-  nil)
+;;; I nuked this because it's not a good idea for users to think of using it.
+;;; These options are a matter of installation preference, and have nothing to
+;;; with particular source files; it's a mistake to suggest to users
+;;; they should associate these with particular source files.
+;;; There is hardly any reason to change these parameters, anyway.
+;;; --rms.
+
+;; (put 'byte-compiler-options 'lisp-indent-hook 0)
+;; (defmacro byte-compiler-options (&rest args)
+;;   "Set some compilation-parameters for this file.  This will affect only the
+;; file in which it appears; this does nothing when evaluated, and when loaded
+;; from a .el file.
+;; 
+;; Each argument to this macro must be a list of a key and a value.
+;; 
+;;   Keys:                Values:               Corresponding variable:
+;; 
+;;   verbose      t, nil                byte-compile-verbose
+;;   optimize     t, nil, source, byte  byte-compile-optimize
+;;   warnings     list of warnings      byte-compile-warnings
+;;                    Legal elements: (callargs redefine free-vars unresolved)
+;;   file-format          emacs18, emacs19      byte-compile-compatibility
+;; 
+;; For example, this might appear at the top of a source file:
+;; 
+;;     (byte-compiler-options
+;;       (optimize t)
+;;       (warnings (- free-vars))               ; Don't warn about free variables
+;;       (file-format emacs19))"
+;;   nil)
+
+;;; byte-run.el ends here
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 6eca77808c2..b2345cbd089 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1,4 +1,11 @@
 ;;; calendar.el --- Calendar functions.
+
+;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
+;; Last-Modified: 30 Jun 1992
+;; Keyword: calendar
+
+(defconst calendar-version "Version 4.02, released June 14, 1992")
+
 ;;; Copyright (C) 1988, 1989, 1990, 1991 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
@@ -18,6 +25,8 @@
 ;; file named COPYING.  Among other things, the copyright notice
 ;; and this notice must be preserved on all copies.
 
+;;; Commentary:
+
 ;; This collection of functions implements a calendar window.  It generates
 ;; generates a calendar for the current month, together with the previous and
 ;; coming months, or for any other three-month period.  The calendar can be
@@ -66,7 +75,7 @@
 ;; Software--Practice and Experience, Volume 20, Number 9 (September, 1990),
 ;; pages 899-928.
 
-(defconst calendar-version "Version 4.02, released June 14, 1992")
+;;; Code:
 
 (defvar view-diary-entries-initially nil
   "*If T, the diary entries for the current date will be displayed on entry.
@@ -996,7 +1005,7 @@ holidays are found, nil if not."
      (if today-visible today (list displayed-month 1 displayed-year)))
     (set-buffer-modified-p nil)
     (or (one-window-p t)
-        (/= (screen-width) (window-width))
+        (/= (frame-width) (window-width))
         (shrink-window (- (window-height) 9)))
     (sit-for 0)
     (and mark-holidays-in-calendar
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 7e58d4c8401..c173eafcdd8 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -2,6 +2,7 @@
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Last-Modified: 14 Jul 1992
+;; Keywords: calendar
 
 ;;; Copyright (C) 1989, 1990 Free Software Foundation, Inc.
 
diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index abf8f467fb9..94d723cb55d 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -2,6 +2,7 @@
 
 ;; Author: Olin Shivers <olin.shivers@cs.cmu.edu>
 ;; Last-Modified: 16 Mar 1992
+;; Keyword: processes, lisp
 
 ;;; Copyright Olin Shivers (1988)
 ;;; Please imagine a long, tedious, legalistic 5-page gnu-style copyright
diff --git a/lisp/comint.el b/lisp/comint.el
index b4686ac42a4..9729005ec13 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -3,6 +3,7 @@
 ;; Maintainer: Olin Shivers <shivers@cs.cmu.edu>
 ;; Last-Modified: 16 Jul 1992
 ;; Version: 2.03
+;; Keyword: estensions, processes
 
 ;;; Copyright Olin Shivers (1988).
 
diff --git a/lisp/diary-lib.el b/lisp/diary-lib.el
index 0c2808cbc2d..1460b4b535a 100644
--- a/lisp/diary-lib.el
+++ b/lisp/diary-lib.el
@@ -2,6 +2,7 @@
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Last-Modified: 30 Jun 1992
+;; Keyword: calendar
 
 ;; Copyright (C) 1989, 1990 Free Software Foundation, Inc.
 
diff --git a/lisp/diff.el b/lisp/diff.el
index aa0551cef08..d878cc538c0 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -4,6 +4,7 @@
 ;; Maintainer: FSF
 ;; Created: 27 Jan 1989
 ;; Last-Modified: 21 Dec 1992
+;; Keyword: unix, tools
 
 ;; Copyright (C) 1990 Free Software Foundation, Inc.
 
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index 713a8984acd..8d32aabd203 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 16 Mar 1992
+;; Keywords: help, extensions
 
 ;; Copyright (C) 1986 Free Software Foundation, Inc.
 
diff --git a/lisp/electric.el b/lisp/electric.el
index cce4b101304..0a078e4ca24 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -3,6 +3,7 @@
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
 ;; Last-Modified: 09 Jun 1992
+;; Keywords: extensions
 
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
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) 
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index 15a45251f53..4a3c88d0153 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -4,6 +4,7 @@
 ;; Maintainer: FSF
 ;; Created: 27 Aug 1986
 ;; Last-Modified: 09 May 1991
+;; Keywords: emulations
 
 ;; Copyright (C) 1986 Free Software Foundation, Inc.
 ;;  It started from public domain code by Mike Clarkson
diff --git a/lisp/emulation/mlconvert.el b/lisp/emulation/mlconvert.el
index e1609a8748c..310654fb2b1 100644
--- a/lisp/emulation/mlconvert.el
+++ b/lisp/emulation/mlconvert.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 09 May 1991
+;; Keywords: extensions
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
diff --git a/lisp/emulation/mlsupport.el b/lisp/emulation/mlsupport.el
index 7023662e764..91c62a50d3f 100644
--- a/lisp/emulation/mlsupport.el
+++ b/lisp/emulation/mlsupport.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 16 Mar 1992
+;; Keywords: extensions
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index be7b0eaf662..69ea06c4a75 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -4,6 +4,7 @@
 ;;      Sebastian Kremer <sk@thp.uni-koeln.de>
 ;; Maintainer: Roland McGrath <roland@gnu.ai.mit.edu>
 ;; Last-Modified: 16 Mar 1992
+;; Keywords: unix
 
 (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 $")
diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el
index 637db1dca80..0cc2d0fa08e 100644
--- a/lisp/flow-ctrl.el
+++ b/lisp/flow-ctrl.el
@@ -4,6 +4,7 @@
 ;; Maintainer: FSF
 ;; Last-Modified: 03 Jun 1992
 ;; Adapted-By: ESR
+;; Keywords: hardware
 
 ;;; Copyright (C) 1990 Free Software Foundation, Inc.
 ;;; Copyright (C) 1991 Kevin Gallagher
diff --git a/lisp/frame.el b/lisp/frame.el
index 734357ffd5f..4d0165f5bc9 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 09 Jul 92
+;; Keywords: internal
 
 ;;;; Copyright (C) 1990, 1992 Free Software Foundation, Inc.
 
diff --git a/lisp/gnus.el b/lisp/gnus.el
index ea56efd1b73..198b1bde62c 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -2,6 +2,7 @@
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;; Last-Modified: 10 Jun 1992
+;; Keywords: news
 
 ;; $Header: gnus.el,v 3.13 90/03/23 13:24:27 umerin Locked $
 
diff --git a/lisp/gnusmail.el b/lisp/gnusmail.el
index 049cd47c626..a9f566abc79 100644
--- a/lisp/gnusmail.el
+++ b/lisp/gnusmail.el
@@ -2,6 +2,7 @@
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;; Last-Modified: 10 Jun 1992
+;; Keywords: news
 
 ;; $Header: gnusmail.el,v 1.1 90/03/23 13:24:39 umerin Locked $
 
diff --git a/lisp/gnusmisc.el b/lisp/gnusmisc.el
index 8d1b0e37820..1a0fd0006e2 100644
--- a/lisp/gnusmisc.el
+++ b/lisp/gnusmisc.el
@@ -2,6 +2,7 @@
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;; Last-Modified: 10 Jun 1992
+;; Keywords: news
 
 ;; $Header: gnusmisc.el,v 1.2 90/03/23 13:25:04 umerin Locked $
 
diff --git a/lisp/gnuspost.el b/lisp/gnuspost.el
index b5becd39fca..188fc02f931 100644
--- a/lisp/gnuspost.el
+++ b/lisp/gnuspost.el
@@ -2,6 +2,7 @@
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;; Last-Modified: 10 Jun 1992
+;; Keywords: news
 
 ;; $Header: gnuspost.el,v 1.2 90/03/23 13:25:16 umerin Locked $
 
diff --git a/lisp/gosmacs.el b/lisp/gosmacs.el
index 5791956bb61..060699e7d5e 100644
--- a/lisp/gosmacs.el
+++ b/lisp/gosmacs.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 09 May 1991
+;; Keywords: emulations
 
 ;; Copyright (C) 1986 Free Software Foundation, Inc.
 
diff --git a/lisp/grow-vers.el b/lisp/grow-vers.el
index ceea85d9a06..11c6fe02335 100644
--- a/lisp/grow-vers.el
+++ b/lisp/grow-vers.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 31 Oct 1989
+;; Keywords: internal
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
diff --git a/lisp/help.el b/lisp/help.el
index 6c4c33e40fa..0a96066fc5f 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 30 Jun 1992
+;; Keywords: help, internal
 
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
diff --git a/lisp/inc-vers.el b/lisp/inc-vers.el
index 0260dfa5232..514aac3f102 100644
--- a/lisp/inc-vers.el
+++ b/lisp/inc-vers.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 31 Oct 1989
+;; Keywords: internal
 
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
diff --git a/lisp/info.el b/lisp/info.el
index abf05ea71ff..09e49f15615 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 30 Jun 1992
+;; Keywords: help
 
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
diff --git a/lisp/informat.el b/lisp/informat.el
index af970512ee6..e6772b62887 100644
--- a/lisp/informat.el
+++ b/lisp/informat.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 09 May 1991
+;; Keywords: help
 
 ;; Copyright (C) 1986 Free Software Foundation, Inc.
 
diff --git a/lisp/ledit.el b/lisp/ledit.el
index 1f8667bd268..9ca2de53c22 100644
--- a/lisp/ledit.el
+++ b/lisp/ledit.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 13 May 1991
+;; Keyord: languages
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 81123a297ea..21e770a3cfb 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 14 Jul 1992
+;; Keywords: internal
 
 ;; This is loaded into a bare Emacs to make a dumpable one.
 ;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc.
diff --git a/lisp/lpr.el b/lisp/lpr.el
index d6b3723f2a5..9fefce9a109 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 19 Apr 1992
+;; Keywords: unix
 
 ;; Copyright (C) 1985, 1988, 1992 Free Software Foundation, Inc.
 
diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index dbed4b708b6..6cff8b2f250 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 16 Mar 1992
+;; Keywords: mail, news
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index e734586046c..7a61ec07c74 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -4,6 +4,7 @@
 ;;      Roland McGrath <roland@gnu.ai.mit.edu>
 ;; Created: 19 Oct 90
 ;; Last-Modified: 13 Jun 92
+;; Keywords: mail
 
 ;;; ??? We must get papers for this or delete it.
 ;;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc.
diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index 190ba5aa887..f71efc00028 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 01 Jun 1992
+;; Keywords: mail
 
 ;; Copyright (C) 1985, 1987 Free Software Foundation, Inc.
 
diff --git a/lisp/mail/mailpost.el b/lisp/mail/mailpost.el
index 4124c1e91ef..f39d8ee61c2 100644
--- a/lisp/mail/mailpost.el
+++ b/lisp/mail/mailpost.el
@@ -4,6 +4,7 @@
 ;; Maintainer: FSF
 ;; Created: 13 Jan 1986
 ;; Last-Modified: 30 May 1992
+;; Keywords: mail
 
 ;; This is in the public domain
 ;; since Delp distributed it without a copyright notice in 1986.
diff --git a/lisp/makesum.el b/lisp/makesum.el
index 46dd0dfe5a4..592d44f7980 100644
--- a/lisp/makesum.el
+++ b/lisp/makesum.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 09 May 1991
+;; Keywords: help
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
diff --git a/lisp/man.el b/lisp/man.el
index 77201267a80..aaffb95adc6 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 21 Dec 1991
+;; Keywords: unix
 
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
diff --git a/lisp/map-ynp.el b/lisp/map-ynp.el
index 16b34246790..a7b046fbc38 100644
--- a/lisp/map-ynp.el
+++ b/lisp/map-ynp.el
@@ -2,6 +2,7 @@
 
 ;; Author: Roland McGrath <roland@gnu.ai.mit.edu>
 ;; Last-Modified: 14 Mar 1992
+;; Keywords: lisp, extensions
 
 ;;; Copyright (C) 1991, 1992 Free Software Foundation, Inc.
 ;;;
diff --git a/lisp/medit.el b/lisp/medit.el
index c5dbf23817e..0aacf03bde2 100644
--- a/lisp/medit.el
+++ b/lisp/medit.el
@@ -3,6 +3,7 @@
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
 ;; Last-Modified: 05 Apr 1991
+;; Keywords: languages
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
diff --git a/lisp/mh-e.el b/lisp/mh-e.el
index 3151de7b6fb..541a610997b 100644
--- a/lisp/mh-e.el
+++ b/lisp/mh-e.el
@@ -3,6 +3,7 @@
 ;; Author: James Larus <larus@ginger.berkeley.edu>
 ;; Version: 3.7
 ;; Last-Modified: 30 Jun 1992
+;; Keywords: mail
 
 (defvar mh-e-RCS-id)
 (setq mh-e-RCS-id "$Header: /var/home/larus/lib/emacs/RCS/mh-e.el,v 3.1 90/09/28 15:47:58 larus Exp Locker: larus $")
diff --git a/lisp/mhspool.el b/lisp/mhspool.el
index 9b33d2e4be6..287dc3ed268 100644
--- a/lisp/mhspool.el
+++ b/lisp/mhspool.el
@@ -3,6 +3,7 @@
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;; Maintainer: FSF
 ;; Last-Modified: 16 Mar 1992
+;; Keywords: mail, news
 
 ;; $Header: mhspool.el,v 1.5 90/03/23 13:25:23 umerin Locked $
 
diff --git a/lisp/mim-mode.el b/lisp/mim-mode.el
index 09d7cb4350f..1a32c15a32f 100644
--- a/lisp/mim-mode.el
+++ b/lisp/mim-mode.el
@@ -3,6 +3,7 @@
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
 ;; Last-Modified: 31 Oct 1989
+;; Keywords: languages
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
diff --git a/lisp/mim-syntax.el b/lisp/mim-syntax.el
index ba84f538111..83756034349 100644
--- a/lisp/mim-syntax.el
+++ b/lisp/mim-syntax.el
@@ -3,6 +3,7 @@
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
 ;; Last-Modified: 31 Oct 1989
+;; Keywords: languages
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
diff --git a/lisp/play/life.el b/lisp/play/life.el
index 59dcbfb3856..89587006009 100644
--- a/lisp/play/life.el
+++ b/lisp/play/life.el
@@ -2,6 +2,7 @@
 
 ;; Author: Kyle Jones <talos!kjones@uunet.uu.net>
 ;; Last-Modified: 16 Mar 1992
+;; Keyword: games
 
 ;; Copyright (C) 1988 Free Software Foundation, Inc.
 
diff --git a/lisp/play/meese.el b/lisp/play/meese.el
index 826f977bccb..570366d7a73 100644
--- a/lisp/play/meese.el
+++ b/lisp/play/meese.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 20 May 1988
+;; Keywords: games
 
 (defun protect-innocence-hook ()
   (if (and (equal (file-name-nondirectory buffer-file-name) "sex.6")
diff --git a/lisp/progmodes/awk-mode.el b/lisp/progmodes/awk-mode.el
index 61cd531e9d2..3fabe5044f4 100644
--- a/lisp/progmodes/awk-mode.el
+++ b/lisp/progmodes/awk-mode.el
@@ -1,12 +1,16 @@
 ;;; awk-mode.el --- AWK code editing commands for Emacs
 
+;; Maintainer: FSF
+;; Last-Modified: 09 May 1991
+;; Keyword: unix, languages
+
 ;; 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 awk-mode-syntax-table nil
   "Syntax table in use in Awk-mode buffers.")
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index f3643de0082..24473df2d3b 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -3,6 +3,7 @@
 ;; Author: Roland McGrath <roland@prep.ai.mit.edu>
 ;; Maintainer: FSF
 ;; Last-Modified: 05 Jul 1992
+;; Keyword: tools, processes
 
 ;;;!!! dup removal is broken.
 
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 60e1e6e4005..c0a1bdef6a4 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -4,6 +4,7 @@
 ;; Maintainer: bug-fortran-mode@erl.mit.edu
 ;; Version 1.28.3
 ;; Last-Modified: 15 Jul 1991
+;; Keywords: languages
 
 ;;; Copyright (c) 1991 Free Software Foundation, Inc.
 
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 482f9527d92..73d1cd68598 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -1,7 +1,8 @@
 ;;; hide-ifdef-mode.el --- hides selected code within ifdef.
 
-;;; Author: Dan LaLiberte <liberte@a.cs.uiuc.edu>
-;;; Last-Modified: 06 Mar 1991
+;; Author: Dan LaLiberte <liberte@a.cs.uiuc.edu>
+;; Last-Modified: 06 Mar 1991
+;; Keywords: c
 
 ;;; $Header: hide-ifdef-mode.el,v 1.7 88/02/16 03:12:58 liberte Exp $
 
diff --git a/lisp/progmodes/icon.el b/lisp/progmodes/icon.el
index 8905bee0b5d..8f2c644b199 100644
--- a/lisp/progmodes/icon.el
+++ b/lisp/progmodes/icon.el
@@ -3,6 +3,7 @@
 ;; Author: Chris Smith <convex!csmith>
 ;; Created: 15 Feb 89
 ;; Last-Modified: 06 Mar 1991
+;; Keywords: languages
 
 ;; Copyright (C) 1989 Free Software Foundation, Inc.
 
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index 58a31b35a11..806c648826a 100644
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -2,6 +2,7 @@
 
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
 ;; Last-Modified: 16 Jul 1993
+;; Keyword: processes, lisp
 
 ;;; Copyright Olin Shivers (1988).
 ;;; Please imagine a long, tedious, legalistic 5-page gnu-style copyright
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 4f7d314773e..2a554728d69 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -2,7 +2,7 @@
 
 ;; Author: Thomas Neumann <tom@smart.bo.open.de>
 ;; Adapted-By: ESR
-;; Keywords: unix tools
+;; Keywords: unix, tools
 
 ;; $Id: makefile.el,v 1.7.1.17 1992/07/15 20:05:15 tom Exp tom $
 
diff --git a/lisp/progmodes/modula2.el b/lisp/progmodes/modula2.el
index d9a23860f66..ebb1ca6a554 100644
--- a/lisp/progmodes/modula2.el
+++ b/lisp/progmodes/modula2.el
@@ -3,6 +3,7 @@
 ;; Author: Michael Schmidt <michael@pbinfo.UUCP> 
 ;;      Tom Perrine <Perrin@LOGICON.ARPA>
 ;; Last-Modified: 30 May 1992 
+;; Keywords: languages
 
 ;; The authors distributed this without a copyright notice
 ;; back in 1988, so it is in the public domain.  The original included
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 85a9c1dd2e4..e54b25c2f84 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -2,6 +2,7 @@
 
 ;; Maintainer: FSF
 ;; Last-Modified: 24 Jun 1992
+;; Keywords: wp
 
 ;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc.