[Emacs-diffs] /srv/bzr/emacs/trunk r99663: Fix keywords.

[Juri Linkov]

------------------------------------------------------------
revno: 99663
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Sun 2010-03-14 23:15:02 +0200
message:
  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.
modified:
  lisp/ChangeLog
  lisp/complete.el
  lisp/emacs-lisp/lisp-mnt.el
  lisp/face-remap.el
  lisp/finder.el
  lisp/log-view.el
  lisp/net/hmac-def.el
  lisp/net/hmac-md5.el
  lisp/net/netrc.el
  lisp/progmodes/mixal-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-03-13 20:33:54 +0000
+++ b/lisp/ChangeLog    2010-03-14 21:15:02 +0000
@@ -1,3 +1,20 @@
+2010-03-14  Juri Linkov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * Makefile.in (ELCFILES): Add net/secrets.elc.

=== modified file 'lisp/complete.el'
--- a/lisp/complete.el  2010-01-13 08:35:10 +0000
+++ b/lisp/complete.el  2010-03-14 21:15:02 +0000
@@ -5,6 +5,7 @@
 
 ;; Author: Dave Gillespie <address@hidden>
 ;; Keywords: abbrev convenience
+;;
 ;; Special thanks to Hallvard Furuseth for his many ideas and contributions.
 
 ;; This file is part of GNU Emacs.

=== modified file 'lisp/emacs-lisp/lisp-mnt.el'
--- a/lisp/emacs-lisp/lisp-mnt.el       2010-01-13 08:35:10 +0000
+++ b/lisp/emacs-lisp/lisp-mnt.el       2010-03-14 21:15:02 +0000
@@ -458,7 +458,9 @@
   "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)

=== modified file 'lisp/face-remap.el'
--- a/lisp/face-remap.el        2010-01-13 08:35:10 +0000
+++ b/lisp/face-remap.el        2010-03-14 21:15:02 +0000
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <address@hidden>
-;; Keywords: faces face remapping display user commands
+;; Keywords: faces, face remapping, display, user commands
 ;;
 ;; This file is part of GNU Emacs.
 ;;

=== modified file 'lisp/finder.el'
--- a/lisp/finder.el    2010-01-13 08:35:10 +0000
+++ b/lisp/finder.el    2010-03-14 21:15:02 +0000
@@ -182,7 +182,7 @@
                            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:

=== modified file 'lisp/log-view.el'
--- a/lisp/log-view.el  2010-03-12 08:04:54 +0000
+++ b/lisp/log-view.el  2010-03-14 21:15:02 +0000
@@ -4,7 +4,7 @@
 ;;   2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <address@hidden>
-;; Keywords: rcs sccs cvs log version-control tools
+;; Keywords: rcs, sccs, cvs, log, version control, tools
 
 ;; This file is part of GNU Emacs.
 

=== modified file 'lisp/net/hmac-def.el'
--- a/lisp/net/hmac-def.el      2010-03-08 17:14:53 +0000
+++ b/lisp/net/hmac-def.el      2010-03-14 21:15:02 +0000
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999, 2001, 2007, 2008, 2009, 2010  Free Software Foundation, 
Inc.
 
 ;; Author: Shuhei KOBAYASHI <address@hidden>
-;; 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:

=== modified file 'lisp/net/hmac-md5.el'
--- a/lisp/net/hmac-md5.el      2010-03-08 17:14:53 +0000
+++ b/lisp/net/hmac-md5.el      2010-03-14 21:15:02 +0000
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999, 2001, 2007, 2008, 2009, 2010  Free Software Foundation, 
Inc.
 
 ;; Author: Shuhei KOBAYASHI <address@hidden>
-;; 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.
 

=== modified file 'lisp/net/netrc.el'
--- a/lisp/net/netrc.el 2010-01-13 08:35:10 +0000
+++ b/lisp/net/netrc.el 2010-03-14 21:15:02 +0000
@@ -4,6 +4,7 @@
 
 ;; Author: Lars Magne Ingebrigtsen <address@hidden>
 ;; Keywords: news
+;;
 ;;  Modularized by Ted Zlatanov <address@hidden>
 ;;  when it was part of Gnus.
 

=== modified file 'lisp/progmodes/mixal-mode.el'
--- a/lisp/progmodes/mixal-mode.el      2010-01-13 08:35:10 +0000
+++ b/lisp/progmodes/mixal-mode.el      2010-03-14 21:15:02 +0000
@@ -7,7 +7,7 @@
 ;; Maintainer: Pieter E.J. Pareit <address@hidden>
 ;; 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.