# HG changeset patch # User Juri Linkov # Date 1268601302 -7200 # Node ID bb307bf2e752a343cb7be62e1e174422f7eb0503 # Parent 51ddd70d1fa10a768299a8a26180502bafbd9439 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 -r 51ddd70d1fa1 -r bb307bf2e752 lisp/ChangeLog --- a/lisp/ChangeLog Sat Mar 13 21:33:54 2010 +0100 +++ b/lisp/ChangeLog Sun Mar 14 23:15:02 2010 +0200 @@ -1,3 +1,20 @@ +2010-03-14 Juri Linkov + + * 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 * Makefile.in (ELCFILES): Add net/secrets.elc. diff -r 51ddd70d1fa1 -r bb307bf2e752 lisp/complete.el --- a/lisp/complete.el Sat Mar 13 21:33:54 2010 +0100 +++ b/lisp/complete.el Sun Mar 14 23:15:02 2010 +0200 @@ -5,6 +5,7 @@ ;; Author: Dave Gillespie ;; Keywords: abbrev convenience +;; ;; Special thanks to Hallvard Furuseth for his many ideas and contributions. ;; This file is part of GNU Emacs. diff -r 51ddd70d1fa1 -r bb307bf2e752 lisp/emacs-lisp/lisp-mnt.el --- a/lisp/emacs-lisp/lisp-mnt.el Sat Mar 13 21:33:54 2010 +0100 +++ b/lisp/emacs-lisp/lisp-mnt.el Sun Mar 14 23:15:02 2010 +0200 @@ -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) diff -r 51ddd70d1fa1 -r bb307bf2e752 lisp/face-remap.el --- a/lisp/face-remap.el Sat Mar 13 21:33:54 2010 +0100 +++ b/lisp/face-remap.el Sun Mar 14 23:15:02 2010 +0200 @@ -3,7 +3,7 @@ ;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. ;; ;; Author: Miles Bader -;; Keywords: faces face remapping display user commands +;; Keywords: faces, face remapping, display, user commands ;; ;; This file is part of GNU Emacs. ;; diff -r 51ddd70d1fa1 -r bb307bf2e752 lisp/finder.el --- a/lisp/finder.el Sat Mar 13 21:33:54 2010 +0100 +++ b/lisp/finder.el Sun Mar 14 23:15:02 2010 +0200 @@ -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: diff -r 51ddd70d1fa1 -r bb307bf2e752 lisp/log-view.el --- a/lisp/log-view.el Sat Mar 13 21:33:54 2010 +0100 +++ b/lisp/log-view.el Sun Mar 14 23:15:02 2010 +0200 @@ -4,7 +4,7 @@ ;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Stefan Monnier -;; Keywords: rcs sccs cvs log version-control tools +;; Keywords: rcs, sccs, cvs, log, version control, tools ;; This file is part of GNU Emacs. diff -r 51ddd70d1fa1 -r bb307bf2e752 lisp/net/hmac-def.el --- a/lisp/net/hmac-def.el Sat Mar 13 21:33:54 2010 +0100 +++ b/lisp/net/hmac-def.el Sun Mar 14 23:15:02 2010 +0200 @@ -3,7 +3,7 @@ ;; Copyright (C) 1999, 2001, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Shuhei KOBAYASHI -;; 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 -r 51ddd70d1fa1 -r bb307bf2e752 lisp/net/hmac-md5.el --- a/lisp/net/hmac-md5.el Sat Mar 13 21:33:54 2010 +0100 +++ b/lisp/net/hmac-md5.el Sun Mar 14 23:15:02 2010 +0200 @@ -3,7 +3,7 @@ ;; Copyright (C) 1999, 2001, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Shuhei KOBAYASHI -;; 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 -r 51ddd70d1fa1 -r bb307bf2e752 lisp/net/netrc.el --- a/lisp/net/netrc.el Sat Mar 13 21:33:54 2010 +0100 +++ b/lisp/net/netrc.el Sun Mar 14 23:15:02 2010 +0200 @@ -4,6 +4,7 @@ ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news +;; ;; Modularized by Ted Zlatanov ;; when it was part of Gnus. diff -r 51ddd70d1fa1 -r bb307bf2e752 lisp/progmodes/mixal-mode.el --- a/lisp/progmodes/mixal-mode.el Sat Mar 13 21:33:54 2010 +0100 +++ b/lisp/progmodes/mixal-mode.el Sun Mar 14 23:15:02 2010 +0200 @@ -7,7 +7,7 @@ ;; Maintainer: Pieter E.J. Pareit ;; 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.