[Emacs-diffs] emacs-24 r116973: * lisp/nxml/nxml-mode.el (nxml-fontify-matcher): Make sure propertization

[Stefan Monnier]

------------------------------------------------------------
revno: 116973
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17264
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-04-16 11:28:26 -0400
message:
  * lisp/nxml/nxml-mode.el (nxml-fontify-matcher): Make sure propertization
  was done.
  * lisp/nxml/xmltok.el (xmltok-scan-after-comment-open): Extend unclosed
  comment to EOB.
added:
  test/indent/nxml.xml           nxml.xml-20140416152750-mna1htrtv2r2qo7o-1
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/nxml/nxml-mode.el         
nxmlmode.el-20091113204419-o5vbwnq5f7feedwu-7813
  lisp/nxml/xmltok.el            xmltok.el-20091113204419-o5vbwnq5f7feedwu-7836

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-16 14:13:06 +0000
+++ b/lisp/ChangeLog    2014-04-16 15:28:26 +0000
@@ -1,5 +1,10 @@
 2014-04-16  Stefan Monnier  <address@hidden>
 
+       * nxml/nxml-mode.el (nxml-fontify-matcher): Make sure propertization
+       was done (bug#17264).
+       * nxml/xmltok.el (xmltok-scan-after-comment-open): Extend unclosed
+       comment to EOB.
+
        * progmodes/perl-mode.el (perl-calculate-indent): Don't auto-indent in
        here-documents (bug#17262).
 

=== modified file 'lisp/nxml/nxml-mode.el'
--- a/lisp/nxml/nxml-mode.el    2014-03-21 06:56:55 +0000
+++ b/lisp/nxml/nxml-mode.el    2014-04-16 15:28:26 +0000
@@ -872,7 +872,7 @@
 
 (defun nxml-fontify-matcher (bound)
   "Called as font-lock keyword matcher."
-
+  (syntax-propertize bound)
   (unless nxml-degraded
     (nxml-debug-change "nxml-fontify-matcher" (point) bound)
 

=== modified file 'lisp/nxml/xmltok.el'
--- a/lisp/nxml/xmltok.el       2014-03-21 06:56:55 +0000
+++ b/lisp/nxml/xmltok.el       2014-04-16 15:28:26 +0000
@@ -750,7 +750,8 @@
                  ;; Need do this after the goto-char because
                  ;; marked error should just apply to <!--
                  (xmltok-add-error "First following `--' not followed by `>'")
-                 'not-well-formed)))))
+                 (goto-char (point-max))
+                 'comment)))))
 
 (defun xmltok-scan-attributes ()
   (let ((recovering nil)

=== added file 'test/indent/nxml.xml'
--- a/test/indent/nxml.xml      1970-01-01 00:00:00 +0000
+++ b/test/indent/nxml.xml      2014-04-16 15:28:26 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<spocosy version="1.0" responsetime="2011-03-15 13:53:12" exec="0.171">
+  <!--
+      <query-response requestid="" service="objectquery">
+      <sport name="Soccer" enetSportCode="s" del="no" n="1" ut="2009-12-29
+      15:36:24" id="1">
+      </sport>
+      </query-response>
+  -->
+</spocosy>