diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-04-16 11:28:26 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-04-16 11:28:26 -0400 |
| commit | b262bde327db2cd9b2f01f2d3ed946d0b188cb9d (patch) | |
| tree | 4af1a9d00a5e77bbdd9b0d7f4e90651a7eae258f | |
| parent | c76a7a5cd27eb2359f383d481005bf12010f368e (diff) | |
| download | emacs-b262bde327db2cd9b2f01f2d3ed946d0b188cb9d.tar.gz | |
* 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.
Fixes: debbugs:17264
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/nxml/nxml-mode.el | 2 | ||||
| -rw-r--r-- | lisp/nxml/xmltok.el | 3 | ||||
| -rw-r--r-- | test/indent/nxml.xml | 10 |
4 files changed, 18 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 38f71bdd78d..e974b30700b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2014-04-16 Stefan Monnier <monnier@iro.umontreal.ca> + * 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). diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el index 0daf62d804f..cd50bce2152 100644 --- a/lisp/nxml/nxml-mode.el +++ b/lisp/nxml/nxml-mode.el @@ -872,7 +872,7 @@ Called with `font-lock-beg' and `font-lock-end' dynamically bound." (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) diff --git a/lisp/nxml/xmltok.el b/lisp/nxml/xmltok.el index 58a2f16d586..f80a5fd2fa1 100644 --- a/lisp/nxml/xmltok.el +++ b/lisp/nxml/xmltok.el @@ -750,7 +750,8 @@ Return the type of the token." ;; 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) diff --git a/test/indent/nxml.xml b/test/indent/nxml.xml new file mode 100644 index 00000000000..61b84f270b0 --- /dev/null +++ b/test/indent/nxml.xml @@ -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> |