From aabeb8bb96425f17603fd13d9aa1b509b4bd521f Mon Sep 17 00:00:00 2001 From: Magnus Henoch Date: Fri, 13 Oct 2006 00:33:55 +0000 Subject: [PATCH] (w3-slow-parse-buffer): Don't call w3-element-content-model on nil values. --- ChangeLog | 5 +++++ lisp/w3-parse.el | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6eb59a0..865fb36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-10-13 Magnus Henoch + + * lisp/w3-parse.el (w3-slow-parse-buffer): Don't call + w3-element-content-model on nil values. + 2006-10-12 Magnus Henoch * lisp/w3-imap.el (w3-image-loadable-p): Ignore errors in diff --git a/lisp/w3-parse.el b/lisp/w3-parse.el index 65cb4e9..6bc1b5b 100644 --- a/lisp/w3-parse.el +++ b/lisp/w3-parse.el @@ -2490,9 +2490,11 @@ Returns a data structure containing the parsed information." ((looking-at "/>") (forward-char 2) (or ;; XHTML-style empty tag - (eq 'EMPTY - (w3-element-content-model - (get w3-p-d-tag-name 'html-element-info))) + (let ((html-element-info (get w3-p-d-tag-name 'html-element-info))) + (and html-element-info + (eq 'EMPTY + (w3-element-content-model + html-element-info)))) ;; XHTML empty element which is not ordinarily ;; empty. Simulate by inserting an end tag. (save-excursion