summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/generic.el
diff options
context:
space:
mode:
authorKenichi Handa <handa@gnu.org>2013-06-18 23:49:59 +0900
committerKenichi Handa <handa@gnu.org>2013-06-18 23:49:59 +0900
commitde86fd6193edf3e78c9b8074f9cf475b3cc560f9 (patch)
treed58ae133163d5269d73c3ce247b663ff2cd5e8d9 /lisp/emacs-lisp/generic.el
parent3c542890fe6fb88ecdca7e38c9f85e7360980110 (diff)
parent7946c240f94fb9802e89ab90d0e4c239e337f266 (diff)
downloademacs-de86fd6193edf3e78c9b8074f9cf475b3cc560f9.tar.gz
emacs-de86fd6193edf3e78c9b8074f9cf475b3cc560f9.tar.bz2
emacs-de86fd6193edf3e78c9b8074f9cf475b3cc560f9.zip
merge emacs
Diffstat (limited to 'lisp/emacs-lisp/generic.el')
-rw-r--r--lisp/emacs-lisp/generic.el7
1 files changed, 2 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el
index cb86a554335..3eb64f9f7f0 100644
--- a/lisp/emacs-lisp/generic.el
+++ b/lisp/emacs-lisp/generic.el
@@ -44,11 +44,8 @@
;; end at the end of the line.) Emacs does not support comment
;; strings of more than two characters in length.
;;
-;; * List of keywords to font-lock. Each keyword should be a string.
-;; If you have additional keywords which should be highlighted in a
-;; face different from `font-lock-keyword-face', you can use the
-;; convenience function `generic-make-keywords-list' (which see),
-;; and add the result to the following list:
+;; * List of keywords to font-lock in `font-lock-keyword-face'.
+;; Each keyword should be a string.
;;
;; * Additional expressions to font-lock. This should be a list of
;; expressions, each of which should be of the same form as those in