emacs/lisp/nxml, branch dima_regex_embedded_modifiers Emacs is the extensible, customizable, self-documenting real-time display editor. (rng-c-fix-escaped-newlines): Use subst-char-in-string 2016-01-25T15:56:04+00:00 Stefan Monnier 2016-01-25T15:56:04+00:00 ce0eee83854a23985a476f72306c9cc04eb8747e * lisp/nxml/rng-cmpct.el (rng-c-fix-escaped-newlines): Use subst-char-in-string. 
* lisp/nxml/rng-cmpct.el (rng-c-fix-escaped-newlines):
Use subst-char-in-string.
lisp/nxml: Use syntax-tables for comments 2016-01-16T20:03:42+00:00 Stefan Monnier 2016-01-16T20:03:42+00:00 56e1097584c13f2b6db85592769db1c6c36e9419 * lisp/nxml/nxml-mode.el (nxml-set-face): Prepend. (nxml-mode): Set syntax-ppss-table. Use sgml-syntax-propertize-function for syntax-propertize-function. Let font-lock highlight strings and comments. (nxml-degrade): Don't touch "nxml-inside" property any more. (nxml-after-change, nxml-after-change1): Remove functions. (comment): Don't set fontify rule any more. (nxml-fontify-attribute): Don't highlight the value any more. (nxml-namespace-attribute-value-delimiter, nxml-namespace-attribute-value) (nxml-comment-delimiter, nxml-comment-content): Remove faces. * lisp/nxml/nxml-rap.el (nxml-scan-end): Remove. (nxml-get-inside, nxml-inside-start, nxml-inside-end): Use syntax-ppss. (nxml-clear-inside, nxml-set-inside): Remove. (nxml-scan-after-change): Remove function. (nxml-scan-prolog, nxml-tokenize-forward): Simplify. (nxml-ensure-scan-up-to-date): Use syntax-propertize. (nxml-move-outside-backwards): * lisp/nxml/nxml-outln.el (nxml-section-tag-backward): Adjust to new nxml-inside-start behavior. * lisp/nxml/nxml-util.el (nxml-debug-set-inside) (nxml-debug-clear-inside): Remove macros. * lisp/nxml/xmltok.el (xmltok-forward-special): Remove function. (xmltok-scan-after-comment-open): Simplify. 
* lisp/nxml/nxml-mode.el (nxml-set-face): Prepend.
(nxml-mode): Set syntax-ppss-table.
Use sgml-syntax-propertize-function for syntax-propertize-function.
Let font-lock highlight strings and comments.
(nxml-degrade): Don't touch "nxml-inside" property any more.
(nxml-after-change, nxml-after-change1): Remove functions.
(comment): Don't set fontify rule any more.
(nxml-fontify-attribute): Don't highlight the value any more.
(nxml-namespace-attribute-value-delimiter, nxml-namespace-attribute-value)
(nxml-comment-delimiter, nxml-comment-content): Remove faces.

* lisp/nxml/nxml-rap.el (nxml-scan-end): Remove.
(nxml-get-inside, nxml-inside-start, nxml-inside-end): Use syntax-ppss.
(nxml-clear-inside, nxml-set-inside): Remove.
(nxml-scan-after-change): Remove function.
(nxml-scan-prolog, nxml-tokenize-forward): Simplify.
(nxml-ensure-scan-up-to-date): Use syntax-propertize.
(nxml-move-outside-backwards):
* lisp/nxml/nxml-outln.el (nxml-section-tag-backward): Adjust to new
nxml-inside-start behavior.

* lisp/nxml/nxml-util.el (nxml-debug-set-inside)
(nxml-debug-clear-inside): Remove macros.

* lisp/nxml/xmltok.el (xmltok-forward-special): Remove function.
(xmltok-scan-after-comment-open): Simplify.
* lisp/nxml: Use standard completion; it also works for company-mode 2016-01-16T19:03:29+00:00 Stefan Monnier 2016-01-16T19:03:29+00:00 d7896a6f773dc4ae4e1b56c34b6708fe2bc5610a * lisp/nxml/nxml-mode.el (nxml-complete): Obsolete. (nxml-completion-at-point-function): Remove. (nxml-mode): Don't set completion-at-point-functions. * lisp/nxml/rng-nxml.el (rng-nxml-mode-init): Set it here instead. (rng-completion-at-point): Rename from rng-complete and mark it non-interactive. It is now to be used as completion-at-point-function. (rng-complete-tag, rng-complete-end-tag, rng-complete-attribute-name) (rng-complete-attribute-value): Don't perform completion, but return completion data instead. (rng-complete-qname-function, rng-generate-qname-list): Add a few arguments, previously passed via dynamic coping. (rng-strings-to-completion-table): Rename from rng-strings-to-completion-alist. Don't return an alist. Don't both sorting and uniquifying. * lisp/nxml/rng-util.el (rng-complete-before-point): Delete function. (rng-completion-exact-p, rng-quote-string): Delete functions. * lisp/nxml/rng-valid.el (rng-recover-start-tag-open) (rng-missing-attributes-message, rng-missing-element-message) (rng-mark-missing-end-tags): Use explicit ".." in formats rather than calling rng-quote-string everywhere. 
* lisp/nxml/nxml-mode.el (nxml-complete): Obsolete.
(nxml-completion-at-point-function): Remove.
(nxml-mode): Don't set completion-at-point-functions.
* lisp/nxml/rng-nxml.el (rng-nxml-mode-init): Set it here instead.
(rng-completion-at-point): Rename from rng-complete and mark it
non-interactive.  It is now to be used as completion-at-point-function.
(rng-complete-tag, rng-complete-end-tag, rng-complete-attribute-name)
(rng-complete-attribute-value): Don't perform completion, but return
completion data instead.
(rng-complete-qname-function, rng-generate-qname-list): Add a few
arguments, previously passed via dynamic coping.
(rng-strings-to-completion-table): Rename from
rng-strings-to-completion-alist.  Don't return an alist.  Don't both
sorting and uniquifying.

* lisp/nxml/rng-util.el (rng-complete-before-point): Delete function.
(rng-completion-exact-p, rng-quote-string): Delete functions.

* lisp/nxml/rng-valid.el (rng-recover-start-tag-open)
(rng-missing-attributes-message, rng-missing-element-message)
(rng-mark-missing-end-tags): Use explicit ".." in formats rather than
calling rng-quote-string everywhere.
Use sgml-electric-tag-pair-mode also in nxml-mode 2016-01-16T15:43:19+00:00 Stefan Monnier 2016-01-16T15:43:19+00:00 d10982a91ac2b93bf9a375e00d676a25f90b885a * lisp/nxml/rng-nxml.el: Require sgml-mode. (rng-nxml-easy-menu): Add entry for sgml-electric-tag-pair-mode. (rng-complete-qname-function): Use complete-with-action. * lisp/textmodes/sgml-mode.el (sgml-electric-tag-pair-before-change-function): Let-bind forward-sexp-function, since nxml-mode binds it to something incompatible. * lisp/nxml/nxml-mode.el: Use setq-local and defvar-local. 
* lisp/nxml/rng-nxml.el: Require sgml-mode.
(rng-nxml-easy-menu): Add entry for sgml-electric-tag-pair-mode.
(rng-complete-qname-function): Use complete-with-action.

* lisp/textmodes/sgml-mode.el (sgml-electric-tag-pair-before-change-function):
Let-bind forward-sexp-function, since nxml-mode binds it to
something incompatible.

* lisp/nxml/nxml-mode.el: Use setq-local and defvar-local.
* xmltok.el: Mark the "sole --" rather than the comment opener 2016-01-15T21:59:21+00:00 Stefan Monnier 2016-01-15T21:59:21+00:00 05988c0d527de99d54266cc3ef0688899761ba26 * lisp/nxml/xmltok.el (xmltok-scan-after-comment-open): Put the error marker on the "sole --" rather than on the comment opener. 
* lisp/nxml/xmltok.el (xmltok-scan-after-comment-open): Put the error
marker on the "sole --" rather than on the comment opener.
Update nXML to use Emacs's Unicode support, and lexical-binding 2016-01-15T15:29:20+00:00 Stefan Monnier 2016-01-15T15:29:20+00:00 930f8e8377e40ba161bd16ea4d612cb4c570ee1b * etc/nxml/*.el: Remove obsolete char-name files. * lisp/nxml/xsd-regexp.el (xsdre-range-list-difference): Remove unused var `next'. * lisp/nxml/rng-nxml.el (rng-set-state-after): Don't assume point-min==1. * lisp/nxml/rng-match.el (rng-update-match-state): Simplify. * lisp/nxml/nxml-outln.el (nxml-outline-state-transform-exceptions) (nxml-target-section-pos, nxml-depth-in-target-section) (nxml-outline-state-transform-alist) (nxml-outline-display-section-tag-function): Move decl before first use. * lisp/nxml/nxml-mode.el (nxml-char-name-ignore-case) (nxml-char-name-alist, nxml-char-name-table) (nxml-autoload-char-name-set-list, nxml-named-char-history): Remove vars. (nxml-enable-char-name-set, nxml-disable-char-name-set) (nxml-char-name-set-enabled-p, nxml-autoload-char-name-set) (nxml-define-char-name-set, nxml-get-char-name): Remove functions. (nxml-insert-named-char): Use read-char-by-name instead. (nxml-char-ref-display-extra): Use get-char-code-property. * lisp/nxml/nxml-maint.el (nxml-create-unicode-char-name-sets): Remove function. * lisp/nxml/nxml-glyph.el, lisp/nxml/nxml-uchnm.el: Remove files. 
* etc/nxml/*.el: Remove obsolete char-name files.
* lisp/nxml/xsd-regexp.el (xsdre-range-list-difference): Remove unused
var `next'.
* lisp/nxml/rng-nxml.el (rng-set-state-after): Don't assume point-min==1.
* lisp/nxml/rng-match.el (rng-update-match-state): Simplify.
* lisp/nxml/nxml-outln.el (nxml-outline-state-transform-exceptions)
(nxml-target-section-pos, nxml-depth-in-target-section)
(nxml-outline-state-transform-alist)
(nxml-outline-display-section-tag-function): Move decl before first use.
* lisp/nxml/nxml-mode.el (nxml-char-name-ignore-case)
(nxml-char-name-alist, nxml-char-name-table)
(nxml-autoload-char-name-set-list, nxml-named-char-history): Remove vars.
(nxml-enable-char-name-set, nxml-disable-char-name-set)
(nxml-char-name-set-enabled-p, nxml-autoload-char-name-set)
(nxml-define-char-name-set, nxml-get-char-name): Remove functions.
(nxml-insert-named-char): Use read-char-by-name instead.
(nxml-char-ref-display-extra): Use get-char-code-property.
* lisp/nxml/nxml-maint.el (nxml-create-unicode-char-name-sets):
Remove function.
* lisp/nxml/nxml-glyph.el, lisp/nxml/nxml-uchnm.el: Remove files.
Update copyright year to 2016 2016-01-01T09:34:24+00:00 Paul Eggert 2016-01-01T09:16:19+00:00 0e963201d03d9229bb8ac4323291d2b0119526ed Run admin/update-copyright. 
Run admin/update-copyright.
Fix recent bootstrap problems 2015-09-24T12:54:39+00:00 Stefan Monnier 2015-09-24T12:54:39+00:00 8f88db14946f46a95603dfaa2a425d64b01fbb53 * src/syntax.c (parse_sexp_propertize): Fix last fix. * lisp/nxml/nxml-mode.el (nxml-comment-quote-nested): Fix paren typo. * lisp/emacs-lisp/lisp-mode.el: Require cl-lib for cl-progv. 
* src/syntax.c (parse_sexp_propertize): Fix last fix.
* lisp/nxml/nxml-mode.el (nxml-comment-quote-nested): Fix paren typo.
* lisp/emacs-lisp/lisp-mode.el: Require cl-lib for cl-progv.
; Implement Stefan's feedback on last two commits 2015-09-23T23:49:50+00:00 Ivan Andrus 2015-09-23T15:21:32+00:00 f247147d1646e1d80068d5d8aaf284707606fe9d 






Properly quote nested xml comments (Bug#6267) (Bug#20001)
2015-09-23T23:48:42+00:00

Ivan Andrus

2015-09-08T22:38:13+00:00

ec0ddb5c7a27dd600a68940db762fc5c92550b08

* nxml-mode.el (nxml-comment-quote-nested): New function
(nxml-mode): Set comment-quote-nested-function





* nxml-mode.el (nxml-comment-quote-nested): New function
(nxml-mode): Set comment-quote-nested-function