# HG changeset patch # User Katsumi Yamaoka <yamaoka@jpl.org> # Date 1269326467 0 # Node ID 40292a5708c2d1ae22523e0073f1fc65e8e9a150 # Parent d0d82a838677685626c0974c9fe7cf2744d4de0a# Parent 44c2979819e441355877277515377c74ad0461a2 Merge from mainline. diff -r d0d82a838677 -r 40292a5708c2 lisp/ChangeLog --- 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. diff -r d0d82a838677 -r 40292a5708c2 lisp/textmodes/flyspell.el --- 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.