Mercurial > emacs
changeset 107659:40292a5708c2
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Tue, 23 Mar 2010 06:41:07 +0000 |
parents | d0d82a838677 (current diff) 44c2979819e4 (diff) |
children | e6a6d8c247e4 |
files | |
diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Mar 22 13:28:27 2010 -0400 +++ b/lisp/ChangeLog Tue Mar 23 06:41:07 2010 +0000 @@ -1,3 +1,7 @@ +2010-03-23 Glenn Morris <rgm@gnu.org> + + * textmodes/flyspell.el (sgml-lexical-context): Autoload it. (Bug#5752) + 2010-03-21 Chong Yidong <cyd@stupidchicken.com> * indent.el (indent-for-tab-command): Doc fix.
--- a/lisp/textmodes/flyspell.el Mon Mar 22 13:28:27 2010 -0400 +++ b/lisp/textmodes/flyspell.el Tue Mar 23 06:41:07 2010 +0000 @@ -359,7 +359,7 @@ (put 'html-mode 'flyspell-mode-predicate 'sgml-mode-flyspell-verify) (put 'nxml-mode 'flyspell-mode-predicate 'sgml-mode-flyspell-verify) -(declare-function sgml-lexical-context "sgml-mode" &optional limit) +(autoload 'sgml-lexical-context "sgml-mode") (defun sgml-mode-flyspell-verify () "Function used for `flyspell-generic-check-word-predicate' in SGML mode.