procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly quote nested xml comments (Bug#6267) (Bug#20001)

Browse source 
* nxml-mode.el (nxml-comment-quote-nested): New function
(nxml-mode): Set comment-quote-nested-function
This commit is contained in:
Ivan Andrus 2015-09-08 16:38:13 -06:00
parent 04ef947705
commit ec0ddb5c7a
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lisp/nxml/nxml-mode.el
View file

@ -546,6 +546,8 @@ Many aspects this mode can be customized using
(setq comment-end-skip "[ \t\r\n]*-->")
(make-local-variable 'comment-line-break-function)
(setq comment-line-break-function 'nxml-newline-and-indent)
(make-local-variable 'comment-quote-nested-function)
(setq comment-quote-nested-function 'nxml-comment-quote-nested)
(use-local-map nxml-mode-map)
(save-excursion
(save-restriction
@ -1350,6 +1352,18 @@ of the inserted start-tag or nil if none was inserted."
start-tag-indent)))))
inserted-start-tag-pos))
(defun nxml-comment-quote-nested (cs ce unp)
"Quote nested comments in buffer.
See `comment-quote-nested-function' for more information.")
(goto-char (point-min))
(save-match-data
(while (re-search-forward "-[\\]*-" nil t)
(goto-char (match-beginning 0))
(forward-char 1)
(if unp
(delete-char 1)
(insert "\\")))))
;;; Indentation
(defun nxml-indent-line ()