Add or correct keywords

39 files changed, 453 insertions, 22 deletions

diff --git a/lisp/=cmulisp.el b/lisp/=cmulisp.el
index fff1d95ada8..b247d79718b 100644
--- a/lisp/=cmulisp.el
+++ b/lisp/=cmulisp.el
@@ -1,6 +1,9 @@
 ;;; cmulisp.el --- improved version of standard inferior-lisp mode
 
 ;;; Copyright Olin Shivers (1988).
+
+;; Keywords: processes, lisp
+
 ;;; Please imagine a long, tedious, legalistic 5-page gnu-style copyright
 ;;; notice appearing here to the effect that you may use this code any
 ;;; way you like, as long as you don't charge money for it, remove this
diff --git a/lisp/=diary-lib.el b/lisp/=diary-lib.el
index 95c36d3048b..e0d9127dfa2 100644
--- a/lisp/=diary-lib.el
+++ b/lisp/=diary-lib.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1989, 1990, 1992 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Keywords: diary, calendar
+;; Keywords: calendar
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/=netunam.el b/lisp/=netunam.el
index ee755312f92..21fb36afc03 100644
--- a/lisp/=netunam.el
+++ b/lisp/=netunam.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1988 Free Software Foundation, Inc.
 
 ;; Author: Chris Hanson <cph@zurich.ai.mit.edu>
+;; Keywords: comm
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/=old-shell.el b/lisp/=old-shell.el
new file mode 100644
index 00000000000..4c3944a65f4
--- /dev/null
+++ b/lisp/=old-shell.el
@@ -0,0 +1,399 @@
+;;; old-shell.el --- run a shell in an Emacs window
+
+;; Copyright (C) 1985, 1986, 1987, 1990 Free Software Foundation, Inc.
+
+;; Keywords: processes
+  
+;; 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.
+
+;;; Hacked from tea.el and shell.el by Olin Shivers (shivers@cs.cmu.edu). 8/88
+
+;;; Since this mode is built on top of the general command-interpreter-in-
+;;; a-buffer mode (comint mode), it shares a common base functionality, 
+;;; and a common set of bindings, with all modes derived from comint mode.
+
+;;; For documentation on the functionality provided by comint mode, and
+;;; the hooks available for customising it, see the file comint.el.
+
+;;; Needs fixin:
+;;; When sending text from a source file to a subprocess, the process-mark can 
+;;; move off the window, so you can lose sight of the process interactions.
+;;; Maybe I should ensure the process mark is in the window when I send
+;;; text to the process? Switch selectable?
+
+;;; Code:
+
+(require 'comint)
+(defvar shell-popd-regexp "popd"
+  "*Regexp to match subshell commands equivalent to popd.")
+
+(defvar shell-pushd-regexp "pushd"
+  "*Regexp to match subshell commands equivalent to pushd.")
+
+(defvar shell-cd-regexp "cd"
+  "*Regexp to match subshell commands equivalent to cd.")
+
+(defvar explicit-shell-file-name nil
+  "*If non-nil, is file name to use for explicitly requested inferior shell.")
+
+(defvar explicit-csh-args
+  (if (eq system-type 'hpux)
+      ;; -T persuades HP's csh not to think it is smarter
+      ;; than us about what terminal modes to use.
+      '("-i" "-T")
+    '("-i"))
+  "*Args passed to inferior shell by M-x shell, if the shell is csh.
+Value is a list of strings, which may be nil.")
+
+(defvar shell-dirstack nil
+  "List of directories saved by pushd in this buffer's shell.")
+
+(defvar shell-dirstack-query "dirs"
+  "Command used by shell-resync-dirlist to query shell.")
+
+(defvar shell-mode-map ())
+(cond ((not shell-mode-map)
+       (setq shell-mode-map (copy-keymap comint-mode-map))
+       (define-key shell-mode-map "\t" 'comint-dynamic-complete)
+       (define-key shell-mode-map "\M-?"  'comint-dynamic-list-completions)))
+
+(defvar shell-mode-hook '()
+  "*Hook for customising shell mode")
+
+
+;;; Basic Procedures
+;;; ===========================================================================
+;;;
+
+(defun shell-mode ()
+  "Major mode for interacting with an inferior shell.
+Return after the end of the process' output sends the text from the 
+    end of process to the end of the current line.
+Return before end of process output copies rest of line to end (skipping
+    the prompt) and sends it.
+M-x send-invisible reads a line of text without echoing it, and sends it to
+    the shell.
+
+If you accidentally suspend your process, use \\[comint-continue-subjob]
+to continue it.
+
+cd, pushd and popd commands given to the shell are watched by Emacs to keep
+this buffer's default directory the same as the shell's working directory.
+M-x dirs queries the shell and resyncs Emacs' idea of what the current 
+    directory stack is.
+M-x dirtrack-toggle turns directory tracking on and off.
+
+\\{shell-mode-map}
+Customisation: Entry to this mode runs the hooks on comint-mode-hook and
+shell-mode-hook (in that order).
+
+Variables shell-cd-regexp, shell-pushd-regexp and shell-popd-regexp are used
+to match their respective commands."
+  (interactive)
+  (comint-mode)
+  (setq major-mode 'shell-mode
+        mode-name "Shell"
+        comint-prompt-regexp shell-prompt-pattern
+        comint-input-sentinel 'shell-directory-tracker)
+  (use-local-map shell-mode-map)
+  (make-local-variable 'shell-dirstack)
+  (set (make-local-variable 'shell-dirtrackp) t)
+  (run-hooks 'shell-mode-hook))
+
+
+(defun shell ()
+  "Run an inferior shell, with I/O through buffer *shell*.
+If buffer exists but shell process is not running, make new shell.
+If buffer exists and shell process is running, just switch to buffer *shell*.
+
+The shell to use comes from the first non-nil variable found from these:
+explicit-shell-file-name in Emacs, ESHELL in the environment or SHELL in the
+environment.  If none is found, /bin/sh is used.
+
+If a file ~/.emacs_SHELLNAME exists, it is given as initial input, simulating
+a start-up file for the shell like .profile or .cshrc.  Note that this may
+lose due to a timing error if the shell discards input when it starts up.
+
+The buffer is put in shell-mode, giving commands for sending input
+and controlling the subjobs of the shell.
+
+The shell file name, sans directories, is used to make a symbol name
+such as `explicit-csh-arguments'.  If that symbol is a variable,
+its value is used as a list of arguments when invoking the shell.
+Otherwise, one argument `-i' is passed to the shell.
+
+\(Type \\[describe-mode] in the shell buffer for a list of commands.)"
+  (interactive)
+  (if (not (comint-check-proc "*shell*"))
+      (let* ((prog (or explicit-shell-file-name
+		       (getenv "ESHELL")
+		       (getenv "SHELL")
+		       "/bin/sh"))
+	     (name (file-name-nondirectory prog))
+	     (startfile (concat "~/.emacs_" name))
+	     (xargs-name (intern-soft (concat "explicit-" name "-args"))))
+	(set-buffer (apply 'make-comint "shell" prog
+			   (if (file-exists-p startfile) startfile)
+			   (if (and xargs-name (boundp xargs-name))
+			       (symbol-value xargs-name)
+			     '("-i"))))
+	(shell-mode)))
+  (switch-to-buffer "*shell*"))
+
+
+;;; Directory tracking
+;;; ===========================================================================
+;;; This code provides the shell mode input sentinel
+;;;     SHELL-DIRECTORY-TRACKER
+;;; that tracks cd, pushd, and popd commands issued to the shell, and
+;;; changes the current directory of the shell buffer accordingly.
+;;;
+;;; This is basically a fragile hack, although it's more accurate than
+;;; the original version in shell.el. It has the following failings:
+;;; 1. It doesn't know about the cdpath shell variable.
+;;; 2. It only spots the first command in a command sequence. E.g., it will
+;;;    miss the cd in "ls; cd foo"
+;;; 3. More generally, any complex command (like ";" sequencing) is going to
+;;;    throw it. Otherwise, you'd have to build an entire shell interpreter in
+;;;    emacs lisp.  Failing that, there's no way to catch shell commands where
+;;;    cd's are buried inside conditional expressions, aliases, and so forth.
+;;;
+;;; The whole approach is a crock. Shell aliases mess it up. File sourcing
+;;; messes it up. You run other processes under the shell; these each have
+;;; separate working directories, and some have commands for manipulating
+;;; their w.d.'s (e.g., the lcd command in ftp). Some of these programs have
+;;; commands that do *not* effect the current w.d. at all, but look like they
+;;; do (e.g., the cd command in ftp).  In shells that allow you job
+;;; control, you can switch between jobs, all having different w.d.'s. So
+;;; simply saying %3 can shift your w.d..
+;;;
+;;; The solution is to relax, not stress out about it, and settle for
+;;; a hack that works pretty well in typical circumstances. Remember
+;;; that a half-assed solution is more in keeping with the spirit of Unix, 
+;;; anyway. Blech.
+;;;
+;;; One good hack not implemented here for users of programmable shells
+;;; is to program up the shell w.d. manipulation commands to output
+;;; a coded command sequence to the tty. Something like
+;;;     ESC | <cwd> |
+;;; where <cwd> is the new current working directory. Then trash the
+;;; directory tracking machinery currently used in this package, and
+;;; replace it with a process filter that watches for and strips out
+;;; these messages.
+
+;;; REGEXP is a regular expression. STR is a string. START is a fixnum.
+;;; Returns T if REGEXP matches STR where the match is anchored to start
+;;; at position START in STR. Sort of like LOOKING-AT for strings.
+(defun shell-front-match (regexp str start)
+  (eq start (string-match regexp str start)))
+
+(defun shell-directory-tracker (str)
+  "Tracks cd, pushd and popd commands issued to the shell.
+This function is called on each input passed to the shell.
+It watches for cd, pushd and popd commands and sets the buffer's
+default directory to track these commands.
+
+You may toggle this tracking on and off with M-x dirtrack-toggle.
+If emacs gets confused, you can resync with the shell with M-x dirs.
+
+See variables shell-cd-regexp, shell-pushd-regexp, and shell-popd-regexp.
+Environment variables are expanded, see function substitute-in-file-name."
+  (condition-case err
+    (cond (shell-dirtrackp
+	   (string-match "^\\s *" str) ; skip whitespace
+	   (let ((bos (match-end 0))
+		 (x nil))
+	     (cond ((setq x (shell-match-cmd-w/optional-arg shell-popd-regexp
+							       str bos))
+		    (shell-process-popd (substitute-in-file-name x)))
+		   ((setq x (shell-match-cmd-w/optional-arg shell-pushd-regexp
+							       str bos))
+		    (shell-process-pushd (substitute-in-file-name x)))
+		   ((setq x (shell-match-cmd-w/optional-arg shell-cd-regexp
+							       str bos))
+		    (shell-process-cd (substitute-in-file-name x)))))))
+    (error (message (car (cdr err))))))
+
+
+;;; Try to match regexp CMD to string, anchored at position START.
+;;; CMD may be followed by a single argument. If a match, then return
+;;; the argument, if there is one, or the empty string if not. If
+;;; no match, return nil.
+
+(defun shell-match-cmd-w/optional-arg (cmd str start)
+  (and (shell-front-match cmd str start)
+       (let ((eoc (match-end 0))) ; end of command
+	 (cond ((shell-front-match "\\s *\\(\;\\|$\\)" str eoc)
+		"")			; no arg
+	       ((shell-front-match "\\s +\\([^ \t\;]+\\)\\s *\\(\;\\|$\\)"
+				      str eoc)
+		(substring str (match-beginning 1) (match-end 1))) ; arg
+	       (t nil))))) ; something else.
+;;; The first regexp is [optional whitespace, (";" or the end of string)].
+;;; The second regexp is [whitespace, (an arg), optional whitespace,
+;;;     (";" or end of string)].
+
+
+;;; popd [+n]
+(defun shell-process-popd (arg)
+  (let ((num (if (zerop (length arg)) 0 ; no arg means +0
+		 (shell-extract-num arg))))
+    (if (and num (< num (length shell-dirstack)))
+	(if (= num 0) ; condition-case because the CD could lose.
+	    (condition-case nil (progn (cd (car shell-dirstack))
+				       (setq shell-dirstack
+					     (cdr shell-dirstack))
+				       (shell-dirstack-message))
+	      (error (message "Couldn't cd.")))
+	    (let* ((ds (cons nil shell-dirstack))
+		   (cell (nthcdr (- num 1) ds)))
+	      (rplacd cell (cdr (cdr cell)))
+	      (setq shell-dirstack (cdr ds))
+	      (shell-dirstack-message)))
+	(message "Bad popd."))))
+
+
+;;; cd [dir]
+(defun shell-process-cd (arg)
+  (condition-case nil (progn (cd (if (zerop (length arg)) (getenv "HOME")
+				     arg))
+			     (shell-dirstack-message))
+	   (error (message "Couldn't cd."))))
+
+
+;;; pushd [+n | dir]
+(defun shell-process-pushd (arg)
+  (if (zerop (length arg))
+      ;; no arg -- swap pwd and car of shell stack
+      (condition-case nil (if shell-dirstack
+			      (let ((old default-directory))
+				(cd (car shell-dirstack))
+				(setq shell-dirstack
+				      (cons old (cdr shell-dirstack)))
+				(shell-dirstack-message))
+			      (message "Directory stack empty."))
+	(message "Couldn't cd."))
+
+      (let ((num (shell-extract-num arg)))
+	(if num				; pushd +n
+	    (if (> num (length shell-dirstack))
+		(message "Directory stack not that deep.")
+		(let* ((ds (cons default-directory shell-dirstack))
+		       (dslen (length ds))
+		       (front (nthcdr num ds))
+		       (back (reverse (nthcdr (- dslen num) (reverse ds))))
+		       (new-ds (append front back)))
+		  (condition-case nil
+		      (progn (cd (car new-ds))
+			     (setq shell-dirstack (cdr new-ds))
+			     (shell-dirstack-message))
+		    (error (message "Couldn't cd.")))))
+	       
+	    ;; pushd <dir>
+	    (let ((old-wd default-directory))
+	      (condition-case nil
+		  (progn (cd arg)
+			 (setq shell-dirstack
+			       (cons old-wd shell-dirstack))
+			 (shell-dirstack-message))
+		(error (message "Couldn't cd."))))))))
+
+;; If STR is of the form +n, for n>0, return n. Otherwise, nil.
+(defun shell-extract-num (str)
+  (and (string-match "^\\+[1-9][0-9]*$" str)
+       (string-to-int str)))
+
+
+(defun shell-dirtrack-toggle ()
+  "Turn directory tracking on and off in a shell buffer."
+  (interactive)
+  (setq shell-dirtrackp (not shell-dirtrackp))
+  (message "directory tracking %s."
+	   (if shell-dirtrackp "ON" "OFF")))
+
+;;; For your typing convenience:
+(fset 'dirtrack-toggle 'shell-dirtrack-toggle)
+
+
+(defun shell-resync-dirs ()
+  "Resync the buffer's idea of the current directory stack.
+This command queries the shell with the command bound to 
+shell-dirstack-query (default \"dirs\"), reads the next
+line output and parses it to form the new directory stack.
+DON'T issue this command unless the buffer is at a shell prompt.
+Also, note that if some other subprocess decides to do output
+immediately after the query, its output will be taken as the
+new directory stack -- you lose. If this happens, just do the
+command again."
+  (interactive)
+  (let* ((proc (get-buffer-process (current-buffer)))
+	 (pmark (process-mark proc)))
+    (goto-char pmark)
+    (insert shell-dirstack-query) (insert "\n")
+    (sit-for 0) ; force redisplay
+    (comint-send-string proc shell-dirstack-query) 
+    (comint-send-string proc "\n")
+    (set-marker pmark (point))
+    (let ((pt (point))) ; wait for 1 line
+      ;; This extra newline prevents the user's pending input from spoofing us.
+      (insert "\n") (backward-char 1)
+      (while (not (looking-at ".+\n"))
+	(accept-process-output proc)
+	(goto-char pt)))
+    (goto-char pmark) (delete-char 1) ; remove the extra newline
+    ;; That's the dirlist. grab it & parse it.
+    (let* ((dl (buffer-substring (match-beginning 0) (- (match-end 0) 1)))
+	   (dl-len (length dl))
+	   (ds '())			; new dir stack
+	   (i 0))
+      (while (< i dl-len)
+	;; regexp = optional whitespace, (non-whitespace), optional whitespace
+	(string-match "\\s *\\(\\S +\\)\\s *" dl i) ; pick off next dir
+	(setq ds (cons (substring dl (match-beginning 1) (match-end 1))
+		       ds))
+	(setq i (match-end 0)))
+      (let ((ds (reverse ds)))
+	(condition-case nil
+	    (progn (cd (car ds))
+		   (setq shell-dirstack (cdr ds))
+		   (shell-dirstack-message))
+	  (error (message "Couldn't cd.")))))))
+
+;;; For your typing convenience:
+(fset 'dirs 'shell-resync-dirs)
+
+
+;;; Show the current dirstack on the message line.
+;;; Pretty up dirs a bit by changing "/usr/jqr/foo" to "~/foo".
+;;; (This isn't necessary if the dirlisting is generated with a simple "dirs".)
+;;; All the commands that mung the buffer's dirstack finish by calling
+;;; this guy.
+(defun shell-dirstack-message ()
+  (let ((msg "")
+	(ds (cons default-directory shell-dirstack)))
+    (while ds
+      (let ((dir (car ds)))
+	(if (string-match (format "^%s\\(/\\|$\\)" (getenv "HOME")) dir)
+	    (setq dir (concat "~/" (substring dir (match-end 0)))))
+	(if (string-equal dir "~/") (setq dir "~"))
+	(setq msg (concat msg dir " "))
+	(setq ds (cdr ds))))
+    (message msg)))
+
+(provide 'shell)
+
+;;; old-shell.el ends here
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 422fbb25d00..3e24f0f6388 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -2,6 +2,8 @@
 
 ;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc.
 
+;; Keywords: abbrev
+
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
diff --git a/lisp/abbrevlist.el b/lisp/abbrevlist.el
index 7b54f5f0398..664570e2f1b 100644
--- a/lisp/abbrevlist.el
+++ b/lisp/abbrevlist.el
@@ -2,8 +2,9 @@
 
 ;; Copyright (C) 1986, 1992 Free Software Foundation, Inc.
 ;; Suggested by a previous version by Gildea.
-;; Maintainer: FSF
 
+;; Maintainer: FSF
+;; Keywords: abbrev
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/add-log.el b/lisp/add-log.el
index f9a19281899..ab7760c9c21 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -2,6 +2,8 @@
 
 ;; Copyright (C) 1985, 1986, 1988, 1993 Free Software Foundation, Inc.
 
+;; Keywords: maint
+
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 864ac1db864..a6639f5ff62 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1989 Free Software Foundation, Inc.
 
 ;; Author: Joe Wells <jbw@bigbird.bu.edu>
-;; Keyword: help
+;; Keywords: help
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/array.el b/lisp/array.el
index 24418c10916..1c86c11a6b3 100644
--- a/lisp/array.el
+++ b/lisp/array.el
@@ -4,7 +4,7 @@
 
 ;; Author David M. Brown
 ;; Maintainer: FSF
-;; Keyword: extensions
+;; Keywords: extensions
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index 93f5ea19af4..84e0de91e5b 100644
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -3,7 +3,8 @@
 ;; Copyright (C) 1988, 1989, 1992 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Keywords: French Revolutionary calendar, calendar, diary
+;; Keywords: calendar
+;; Human-Keywords: French Revolutionary calendar, calendar, diary
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/calendar/cal-mayan.el b/lisp/calendar/cal-mayan.el
index 0ee7c8613e4..f0d5b7981f3 100644
--- a/lisp/calendar/cal-mayan.el
+++ b/lisp/calendar/cal-mayan.el
@@ -4,7 +4,8 @@
 
 ;; Author: Stewart M. Clamen <clamen@cs.cmu.edu>
 ;;	Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Keywords: Mayan calendar, Maya, calendar, diary
+;; Keywords: calendar
+;; Human-Keywords: Mayan calendar, Maya, calendar, diary
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 11900f5f7c4..a2de489167a 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -3,8 +3,10 @@
 ;;; Copyright (C) 1988, 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Keywords: calendar, Gregorian calendar, Julian calendar, Hebrew calendar,
-;;	Islamic calendar, ISO calendar, Julian day number, diary, holidays
+;; Keywords: calendar
+;; Human-Keywords: calendar, Gregorian calendar, Julian calendar, 
+;;	Hebrew calendar, Islamic calendar, ISO calendar, Julian day number,
+;;	diary, holidays
 
 (defconst calendar-version "Version 5, released August 10, 1992")
 
diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el
index 904d99ebfca..d6ef380e44c 100644
--- a/lisp/calendar/lunar.el
+++ b/lisp/calendar/lunar.el
@@ -3,7 +3,8 @@
 ;; Copyright (C) 1992 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Keywords: moon, lunar phases, calendar, diary
+;; Keywords: calendar
+;; Human-Keywords: moon, lunar phases, calendar, diary
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index 7ce9f0cf94a..6000d421212 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -3,7 +3,7 @@
 ;;; Copyright (C) 1988 Free Software Foundation, Inc.
 
 ;; Author: Olin Shivers <olin.shivers@cs.cmu.edu>
-;; Keyword: processes, lisp
+;; Keywords: processes, lisp
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/comint.el b/lisp/comint.el
index e4b3f950058..80abf0cd752 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1988, 1990, 1992, 1993 Free Software Foundation, Inc.
 
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
-;; Keyword: processes
+;; Keywords: processes
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/completion.el b/lisp/completion.el
index a24269799d4..8203cbe471b 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -1,6 +1,7 @@
 ;;; completion.el --- dynamic word-completion code
 
 ;; Maintainer: bug-completion@think.com
+;; Keywords: abbrev
 
 ;;; Commentary:
 
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 3c1d967629a..0798b764c2b 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -6,6 +6,7 @@
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
+;; Keywords: abbrev
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/diff.el b/lisp/diff.el
index 4149cf363ce..cd85ec29d10 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1992 Free Software Foundation, Inc.
 
-;; Keyword: unix, tools
+;; Keywords: unix, tools
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index 80bc13da17b..cb9f7739f6d 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -5,6 +5,7 @@
 ;; Author: Dave Gillespie <daveg@csvax.caltech.edu>
 ;; Maintainer: FSF
 ;; Version: 1.02
+;; Keywords: abbrev
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index f8483d0b4df..257aaed9769 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -3,7 +3,7 @@
 ;;; Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
 ;;;
 ;; Author: Roland McGrath <roland@gnu.ai.mit.edu>
-;; Keyword: internal
+;; Keywords: maint
 
 ;;; 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
diff --git a/lisp/emacs-lisp/cust-print.el b/lisp/emacs-lisp/cust-print.el
index 49b76ce18e9..a4fe14d50e9 100644
--- a/lisp/emacs-lisp/cust-print.el
+++ b/lisp/emacs-lisp/cust-print.el
@@ -5,7 +5,7 @@
 ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
 ;; Version: 1.0
 ;; Adapted-By: ESR
-;; Keyword: extensions
+;; Keywords: extensions
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index ad0e1bac10a..c37250f8eae 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
-;; Keyword: lisp, tools
+;; Keywords: lisp, tools, maint
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el
index aca4f015bb1..9045032cad0 100644
--- a/lisp/emacs-lisp/disass.el
+++ b/lisp/emacs-lisp/disass.el
@@ -5,7 +5,7 @@
 ;; Author: Doug Cutting <doug@csli.stanford.edu>
 ;;	Jamie Zawinski <jwz@lucid.com>
 ;; Maintainer: Jamie Zawinski <jwz@lucid.com>
-;; Keyword: internal
+;; Keywords: internal
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 1003e15d4c7..e5a366f6880 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1988, 1989, 1990, 1991 Free Software Foundation, Inc
 
 ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
-;; Keywords: lisp, tools
+;; Keywords: lisp, tools, maint
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 1bf57e1d689..c35574b73be 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
-;; Keyword: lisp, languages
+;; Keywords: lisp, languages
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/finder.el b/lisp/finder.el
index 8306d6c3ee1..b4157703bc6 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -43,9 +43,11 @@
 
 (defvar finder-known-keywords
   '(
+    (abbrev	. "abbreviation handking, typing shortcuts, macros")
     (bib	. "code related to the bib(1) bibliography processor")
     (c		. "C and C++ language support")
     (calendar	. "calendar and time management support")
+    (comm	. "communications, networking, remote access to files")
     (docs	. "support for Emacs documentation")
     (emulations	. "emulations of other editors")
     (extensions	. "Emacs Lisp language extensions")
@@ -82,6 +84,8 @@ arguments compiles from `load-path'."
     (let ((processed nil))
       (find-file "finder-inf.el")
       (erase-buffer)
+      (insert ";;; finder-inf.el --- keyword-to-package mapping\n")
+      (insert ";; Keywords: help\n")
       (insert ";;; Don't edit this file.  It's generated by finder.el\n\n")
       (insert "\n(setq finder-package-info '(\n")
       (mapcar
diff --git a/lisp/macros.el b/lisp/macros.el
index b0673db2824..f1aec4e51b8 100644
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
+;; Keywords: abbrev
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index e8392c095a2..3af19d75ab3 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -4,6 +4,7 @@
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
+;; Keywords: maint
 
 ;; Not fully installed because it can work only on Internet hosts.
 ;; This file is part of GNU Emacs.
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 0850d4be05e..930d9343a83 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -2,6 +2,8 @@
 
 ;;; Copyright (C) 1992 Free Software Foundation, Inc.
 
+;; Keywords: mail
+
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
diff --git a/lisp/mail/vms-pmail.el b/lisp/mail/vms-pmail.el
index ab4d1d8c07b..22091f30d7f 100644
--- a/lisp/mail/vms-pmail.el
+++ b/lisp/mail/vms-pmail.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1992 Free Software Foundation, Inc.
 
 ;; Author: Roland B Roberts <roberts@nsrl31.nsrl.rochester.edu>
+;; Keywords: vms
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/play/life.el b/lisp/play/life.el
index fbaf2b7ec7b..8b8c34b4b98 100644
--- a/lisp/play/life.el
+++ b/lisp/play/life.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1988 Free Software Foundation, Inc.
 
 ;; Author: Kyle Jones <talos!kjones@uunet.uu.net>
-;; Keyword: games
+;; Keywords: games
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/progmodes/awk-mode.el b/lisp/progmodes/awk-mode.el
index 5d335682dd6..b4ec8ddfb0e 100644
--- a/lisp/progmodes/awk-mode.el
+++ b/lisp/progmodes/awk-mode.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1988 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
-;; Keyword: unix, languages
+;; Keywords: unix, languages
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 999427e2610..cacea5194ee 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -4,7 +4,7 @@
 
 ;; Author: Roland McGrath <roland@prep.ai.mit.edu>
 ;; Maintainer: FSF
-;; Keyword: tools, processes
+;; Keywords: tools, processes
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index 5706990ea56..b5f44647979 100644
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -2,7 +2,7 @@
 ;;; Copyright (C) 1988 Free Software Foundation, Inc.
 
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
-;; Keyword: processes, lisp
+;; Keywords: processes, lisp
 
 ;;; This file is part of GNU Emacs.
 
diff --git a/lisp/sun-curs.el b/lisp/sun-curs.el
index e0a530de7bd..3a24d69839e 100644
--- a/lisp/sun-curs.el
+++ b/lisp/sun-curs.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1987 Free Software Foundation, Inc.
 
 ;; Author: Jeff Peck <peck@sun.com>
+;; Keywords: hardware
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/terminal.el b/lisp/terminal.el
index c27adcfdd52..00c419bfa73 100644
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -4,6 +4,7 @@
 
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
 ;; Maintainer: FSF
+;; Keywords: comm, terminals
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/=ispell4.el b/lisp/textmodes/=ispell4.el
index 4c5058fb3a5..ded85446595 100644
--- a/lisp/textmodes/=ispell4.el
+++ b/lisp/textmodes/=ispell4.el
@@ -2,6 +2,8 @@
 
 ;;Copyright (C) 1990, 1991 Free Software Foundation, Inc.
 
+;; Keywords: wp
+
 ;;This file is part of GNU Emacs.
 ;;
 ;;GNU Emacs is free software; you can redistribute it and/or modify
diff --git a/lisp/textmodes/scribe.el b/lisp/textmodes/scribe.el
index 423de634308..6954f5c6284 100644
--- a/lisp/textmodes/scribe.el
+++ b/lisp/textmodes/scribe.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
+;; Keywords: wp
 
 ;; This file might become part of GNU Emacs.
 
diff --git a/lisp/textmodes/spell.el b/lisp/textmodes/spell.el
index 02c7c4eb118..6e05a8c0fad 100644
--- a/lisp/textmodes/spell.el
+++ b/lisp/textmodes/spell.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
+;; Keywords: wp
 
 ;; This file is part of GNU Emacs.