Add or correct keywords

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

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.
 

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

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.
 

lisp/array.el

@@ -4,7 +4,7 @@
 
 ;; Author David M. Brown
 ;; Maintainer: FSF
-;; Keyword: extensions
+;; Keywords: extensions
 
 ;; This file is part of GNU Emacs.
 

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.
 

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.
 

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")
 

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.
 

lisp/cmulisp.el

 ;;; 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

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.
 

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.
 

lisp/completion.el

 ;;; completion.el --- dynamic word-completion code
 
 ;; Maintainer: bug-completion@think.com
+;; Keywords: abbrev
 
 ;;; Commentary:
 

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.
 

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.
 

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.
 

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.
 

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

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.
 

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.
 

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.
 

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.
 

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.
 

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

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.
 

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.

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

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.
 

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.
 

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.
 

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.
 

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.
 

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.
 

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.
 

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.
 

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

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.
 

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.