Fix keywords.

* finder.el (finder-compile-keywords): Replace `princ' with
`prin1' on a list of symbols interned from keyword strings.

* emacs-lisp/lisp-mnt.el (lm-keywords-list): If `keywords' contains
a comma, then split keywords using a comma and optional whitespace.
Otherwise, split by whitespace.

* complete.el:
* face-remap.el:
* log-view.el:
* net/hmac-def.el:
* net/hmac-md5.el:
* net/netrc.el:
* progmodes/mixal-mode.el: Fix keywords.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28335c0..751b607 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2010-03-14  Juri Linkov  <juri@jurta.org>
+
+       * finder.el (finder-compile-keywords): Replace `princ' with
+       `prin1' on a list of symbols interned from keyword strings.
+
+       * emacs-lisp/lisp-mnt.el (lm-keywords-list): If `keywords' contains
+       a comma, then split keywords using a comma and optional whitespace.
+       Otherwise, split by whitespace.
+
+       * complete.el:
+       * face-remap.el:
+       * log-view.el:
+       * net/hmac-def.el:
+       * net/hmac-md5.el:
+       * net/netrc.el:
+       * progmodes/mixal-mode.el: Fix keywords.
+
 2010-03-13  Michael Albinus  <michael.albinus@gmx.de>
 
        * Makefile.in (ELCFILES): Add net/secrets.elc.

diff --git a/lisp/complete.el b/lisp/complete.el
index ba78820..3831524 100644 (file)
--- a/lisp/complete.el
+++ b/lisp/complete.el
@@ -5,6 +5,7 @@
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Keywords: abbrev convenience
+;;
 ;; Special thanks to Hallvard Furuseth for his many ideas and contributions.
 
 ;; This file is part of GNU Emacs.

diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el
index 8a1c753..10b7baf 100644 (file)
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -458,7 +458,9 @@ each line."
   "Return list of keywords given in file FILE."
   (let ((keywords (lm-keywords file)))
     (if keywords
-       (split-string keywords "[, \t\n]+" t))))
+       (if (string-match-p "," keywords)
+           (split-string keywords ",[ \t\n]*" t)
+         (split-string keywords "[ \t\n]+" t)))))
 
 (defvar finder-known-keywords)
 (defun lm-keywords-finder-p (&optional file)

diff --git a/lisp/face-remap.el b/lisp/face-remap.el
index c8fdfff..5067221 100644 (file)
--- a/lisp/face-remap.el
+++ b/lisp/face-remap.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
-;; Keywords: faces face remapping display user commands
+;; Keywords: faces, face remapping, display, user commands
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/finder.el b/lisp/finder.el
index 682fc1d..b1e6790 100644 (file)
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -182,7 +182,7 @@ no arguments compiles from `load-path'."
                            f)))
                 (prin1 summary (current-buffer))
                 (insert "\n        ")
-                (princ keywords (current-buffer))
+                (prin1 (mapcar 'intern keywords) (current-buffer))
                 (insert ")\n")))
            (directory-files d nil
                              ;; Allow compressed files also.  FIXME:

diff --git a/lisp/log-view.el b/lisp/log-view.el
index 5c454ea..233fc3f 100644 (file)
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -4,7 +4,7 @@
 ;;   2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-;; Keywords: rcs sccs cvs log version-control tools
+;; Keywords: rcs, sccs, cvs, log, version control, tools
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/net/hmac-def.el b/lisp/net/hmac-def.el
index 9cbb919..5f57ea6 100644 (file)
--- a/lisp/net/hmac-def.el
+++ b/lisp/net/hmac-def.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999, 2001, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
-;; Keywords: HMAC, RFC-2104
+;; Keywords: HMAC, RFC2104
 
 ;; This file is part of GNU Emacs.
 
@@ -22,7 +22,7 @@
 
 ;;; Commentary:
 
-;; This program is implemented from RFC 2104,
+;; This program is implemented from RFC2104,
 ;; "HMAC: Keyed-Hashing for Message Authentication".
 
 ;;; Code:

diff --git a/lisp/net/hmac-md5.el b/lisp/net/hmac-md5.el
index 9bda79d..045a125 100644 (file)
--- a/lisp/net/hmac-md5.el
+++ b/lisp/net/hmac-md5.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999, 2001, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
-;; Keywords: HMAC, RFC-2104, HMAC-MD5, MD5, KEYED-MD5, CRAM-MD5
+;; Keywords: HMAC, RFC2104, HMAC-MD5, MD5, KEYED-MD5, CRAM-MD5
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el
index 3445b84..99278d9 100644 (file)
--- a/lisp/net/netrc.el
+++ b/lisp/net/netrc.el
@@ -4,6 +4,7 @@
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
+;;
 ;;  Modularized by Ted Zlatanov <tzz@lifelogs.com>
 ;;  when it was part of Gnus.
 

diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index 5b1fc71..ecb8461 100644 (file)
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Pieter E.J. Pareit <pieter.pareit@gmail.com>
 ;; Created: 09 Nov 2002
 ;; Version: 0.1
-;; Keywords: languages Knuth mix mixal asm mixvm "The Art Of Computer Programming"
+;; Keywords: languages, Knuth, mix, mixal, asm, mixvm, The Art Of Computer Programming
 
 ;; This file is part of GNU Emacs.