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

; Implement Stefan's feedback on last two commits

Browse source
This commit is contained in:
Ivan Andrus 2015-09-23 09:21:32 -06:00
parent ec0ddb5c7a
commit f247147d16
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/newcomment.el
View file

@ -418,7 +418,6 @@ If UNP is non-nil, unquote nested comment markers."
(setq cs (comment-string-strip cs t t))
(setq ce (comment-string-strip ce t t))
(when (and comment-quote-nested
comment-quote-nested-function
(> (length ce) 0))
(funcall comment-quote-nested-function cs ce unp)))
@ -427,8 +426,8 @@ If UNP is non-nil, unquote nested comment markers."
It expects to be called with the buffer narrowed to a single comment.
It is used as a default for `comment-quote-nested-function'.
The arguments CS and CE are regular expressions matching comment
starting and ending delimiters respectively.
The arguments CS and CE are strings matching comment starting and
ending delimiters respectively.
If UNP is non-nil, comments are unquoted instead.

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

@ -546,8 +546,7 @@ 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)
(setq-local comment-quote-nested-function 'nxml-comment-quote-nested)
(use-local-map nxml-mode-map)
(save-excursion
(save-restriction