2 files changed, 11 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59f66460314..3e5a9875a2f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-05  Kevin Ryde  <user42@zip.com.au>
+
+        * textmodes/sgml-mode.el (sgml-lexical-context): Recognise
+        comment-start-skip to comment-end-skip as comment (Bug#4781).
+
 2009-12-05  Juri Linkov  <juri@jurta.org>
 
         * info.el (Info-find-node-2): Set `Info-current-subfile' to nil
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 52d0a70e257..7cefa160ed1 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1066,6 +1066,12 @@ If nil, start from a preceding tag at indentation."
                   (let ((cdata-start (point)))
                     (unless (search-forward "]]>" pos 'move)
                       (list 0 nil nil 'cdata nil nil nil nil cdata-start))))
+                 ((looking-at comment-start-skip)
+                  ;; parse-partial-sexp doesn't handle <!-- comments -->,
+                  ;; or only if ?- is in sgml-specials, so match explicitly
+                  (let ((start (point)))
+                    (unless (re-search-forward comment-end-skip pos 'move)
+                      (list 0 nil nil nil t nil nil nil start))))
                  ((and sgml-xml-mode (looking-at "<\\?"))
                   ;; Processing Instructions.
                   ;; In SGML, it's basically a normal tag of the form