diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-09-22 11:11:50 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-09-22 11:11:50 -0400 |
| commit | 6c33e7ada5c0aa0dac1e6298c5b45c0134a90b92 (patch) | |
| tree | fcfc8703ab42a2dad49d95741310849414615cbd /lisp/newcomment.el | |
| parent | 2fa2c87cac834cae253a7fc6fcab280723660f74 (diff) | |
| download | emacs-6c33e7ada5c0aa0dac1e6298c5b45c0134a90b92.tar.gz | |
* prolog.el: Fix indentation of empty line
* lisp/emacs-lisp/smie.el (smie-rules-function): Document new
`empty-line-token' element.
(smie-indent-empty-line): New function.
(smie-indent-functions): Add it.
* lisp/progmodes/prolog.el (prolog-smie-rules): Fix :list-intro behavior
and use the new `empty-line-token' element (bug#21526).
(prolog-mode-variables): Fix comment-start-skip setting to match
comment-start.
* test/indent/prolog.prolog: Add nested indentation tests.
* lisp/newcomment.el (comment-normalize-vars): Fix default value of
comment-start-skip not to misuse submatch 1.
Diffstat (limited to 'lisp/newcomment.el')
| -rw-r--r-- | lisp/newcomment.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/newcomment.el b/lisp/newcomment.el index 60f35c834b3..7df05a0c398 100644 --- a/lisp/newcomment.el +++ b/lisp/newcomment.el @@ -382,7 +382,7 @@ function should first call this function explicitly." (concat (unless (eq comment-use-syntax t) ;; `syntax-ppss' will detect escaping. "\\(\\(^\\|[^\\\n]\\)\\(\\\\\\\\\\)*\\)") - "\\(\\s<+\\|" + "\\(?:\\s<+\\|" (regexp-quote (comment-string-strip comment-start t t)) ;; Let's not allow any \s- but only [ \t] since \n ;; might be both a comment-end marker and \s-. |