Commit 88f4758e authored by Juri Linkov's avatar Juri Linkov
Browse files

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.
parent 7725ebb7
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> 2010-03-13 Michael Albinus <michael.albinus@gmx.de>
* Makefile.in (ELCFILES): Add net/secrets.elc. * Makefile.in (ELCFILES): Add net/secrets.elc.
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
;; Author: Dave Gillespie <daveg@synaptics.com> ;; Author: Dave Gillespie <daveg@synaptics.com>
;; Keywords: abbrev convenience ;; Keywords: abbrev convenience
;;
;; Special thanks to Hallvard Furuseth for his many ideas and contributions. ;; Special thanks to Hallvard Furuseth for his many ideas and contributions.
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
......
...@@ -458,7 +458,9 @@ each line." ...@@ -458,7 +458,9 @@ each line."
"Return list of keywords given in file FILE." "Return list of keywords given in file FILE."
(let ((keywords (lm-keywords file))) (let ((keywords (lm-keywords file)))
(if keywords (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) (defvar finder-known-keywords)
(defun lm-keywords-finder-p (&optional file) (defun lm-keywords-finder-p (&optional file)
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. ;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
;; ;;
;; Author: Miles Bader <miles@gnu.org> ;; 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. ;; This file is part of GNU Emacs.
;; ;;
......
...@@ -182,7 +182,7 @@ no arguments compiles from `load-path'." ...@@ -182,7 +182,7 @@ no arguments compiles from `load-path'."
f))) f)))
(prin1 summary (current-buffer)) (prin1 summary (current-buffer))
(insert "\n ") (insert "\n ")
(princ keywords (current-buffer)) (prin1 (mapcar 'intern keywords) (current-buffer))
(insert ")\n"))) (insert ")\n")))
(directory-files d nil (directory-files d nil
;; Allow compressed files also. FIXME: ;; Allow compressed files also. FIXME:
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; 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. ;; This file is part of GNU Emacs.
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
;; Copyright (C) 1999, 2001, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Copyright (C) 1999, 2001, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp> ;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
;; Keywords: HMAC, RFC-2104 ;; Keywords: HMAC, RFC2104
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
;;; Commentary: ;;; Commentary:
;; This program is implemented from RFC 2104, ;; This program is implemented from RFC2104,
;; "HMAC: Keyed-Hashing for Message Authentication". ;; "HMAC: Keyed-Hashing for Message Authentication".
;;; Code: ;;; Code:
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
;; Copyright (C) 1999, 2001, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Copyright (C) 1999, 2001, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp> ;; 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. ;; This file is part of GNU Emacs.
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news ;; Keywords: news
;;
;; Modularized by Ted Zlatanov <tzz@lifelogs.com> ;; Modularized by Ted Zlatanov <tzz@lifelogs.com>
;; when it was part of Gnus. ;; when it was part of Gnus.
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
;; Maintainer: Pieter E.J. Pareit <pieter.pareit@gmail.com> ;; Maintainer: Pieter E.J. Pareit <pieter.pareit@gmail.com>
;; Created: 09 Nov 2002 ;; Created: 09 Nov 2002
;; Version: 0.1 ;; 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. ;; This file is part of GNU Emacs.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment