[Emacs-diffs] emacs/lisp ChangeLog textmodes/sgml-mode.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/12/05 20:23:28

Modified files:
        lisp           : ChangeLog 
        lisp/textmodes : sgml-mode.el 

Log message:
        * textmodes/sgml-mode.el (sgml-lexical-context): Recognise
        comment-start-skip to comment-end-skip as comment (Bug#4781).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16828&r2=1.16829
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/textmodes/sgml-mode.el?cvsroot=emacs&r1=1.145&r2=1.146

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16828
retrieving revision 1.16829
diff -u -b -r1.16828 -r1.16829
--- ChangeLog   5 Dec 2009 19:49:47 -0000       1.16828
+++ ChangeLog   5 Dec 2009 20:23:25 -0000       1.16829
@@ -1,3 +1,8 @@
+2009-12-05  Kevin Ryde  <address@hidden>
+
+       * textmodes/sgml-mode.el (sgml-lexical-context): Recognise
+       comment-start-skip to comment-end-skip as comment (Bug#4781).
+
 2009-12-05  Juri Linkov  <address@hidden>
 
        * info.el (Info-find-node-2): Set `Info-current-subfile' to nil

Index: textmodes/sgml-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/sgml-mode.el,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -b -r1.145 -r1.146
--- textmodes/sgml-mode.el      31 Oct 2009 21:52:56 -0000      1.145
+++ textmodes/sgml-mode.el      5 Dec 2009 20:23:28 -0000       1.146
@@ -1066,6 +1066,12 @@
                   (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