aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Leach2014-01-14 21:37:28 +0100
committerBastien Guerry2014-01-14 21:37:28 +0100
commit8b63edf8c6ce69677728bc41db67a330f8524ca7 (patch)
treef42b5508a1c832a58007e01f0ae9b520b248ce0b
parentd9784824e239b2eaebe291ce2e351c44ba09c0dc (diff)
downloademacs-8b63edf8c6ce69677728bc41db67a330f8524ca7.tar.gz
emacs-8b63edf8c6ce69677728bc41db67a330f8524ca7.zip
font-lock.el (font-lock-keywords): Fix typo in docstring
* font-lock.el (font-lock-keywords): Fix typo in docstring (bug#16307).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/font-lock.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc2a295f8c3..7a14b857044 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-01-14 Matthew Leach <matthew@mattleach.net> (tiny change)
2
3 * font-lock.el (font-lock-keywords): Fix typo in docstring
4 (bug#16307).
5
12014-01-14 Agustín Martín Domingo <agustin.martin@hispalinux.es> 62014-01-14 Agustín Martín Domingo <agustin.martin@hispalinux.es>
2 7
3 * ispell.el (ispell-region): Reset `in-comment' for new line 8 * ispell.el (ispell-region): Reset `in-comment' for new line
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 27829ff2e7c..7e9131df185 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -458,7 +458,7 @@ This variable is set by major modes via the variable `font-lock-defaults'.
458Be careful when composing regexps for this list; a poorly written pattern can 458Be careful when composing regexps for this list; a poorly written pattern can
459dramatically slow things down! 459dramatically slow things down!
460 460
461A compiled keywords list starts with t. It is produced internal 461A compiled keywords list starts with t. It is produced internally
462by `font-lock-compile-keywords' from a user-level keywords list. 462by `font-lock-compile-keywords' from a user-level keywords list.
463Its second element is the user-level keywords list that was 463Its second element is the user-level keywords list that was
464compiled. The remaining elements have the same form as 464compiled. The remaining elements have the same form as