mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-07 15:00:34 -08:00
Code Issues Projects Releases Wiki Activity

* prolog.el: Fix indentation of empty line

Browse source 
* 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.
This commit is contained in:
Stefan Monnier 2015-09-22 11:11:50 -04:00
parent 2fa2c87cac
commit 6c33e7ada5
4 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lisp/emacs-lisp/smie.el
View file

@ -1136,6 +1136,8 @@ METHOD can be:
- :elem, in which case the function should return either:
- the offset to use to indent function arguments (ARG = `arg')
- the basic indentation step (ARG = `basic').
- the token to use (when ARG = `empty-line-token') when we don't know how
to indent an empty line.
- :list-intro, in which case ARG is a token and the function should return
non-nil if TOKEN is followed by a list of expressions (not separated by any
token) rather than an expression.
@ -1686,6 +1688,19 @@ should not be computed on the basis of the following token."
(+ (smie-indent-virtual) (smie-indent--offset 'basic))) ;
(t (smie-indent-virtual)))))) ;An infix.
(defun smie-indent-empty-line ()
"Indentation rule when there's nothing yet on the line."
;; Without this rule, SMIE assumes that an empty line will be filled with an
;; argument (since it falls back to smie-indent-sexps), which tends
;; to indent far too deeply.
(when (eolp)
(let ((token (or (funcall smie-rules-function :elem 'empty-line-token)
;; FIXME: Should we default to ";"?
;; ";"
)))
(when (assoc token smie-grammar)
(smie-indent-keyword token)))))
(defun smie-indent-exps ()
;; Indentation of sequences of simple expressions without
;; intervening keywords or operators. E.g. "a b c" or "g (balbla) f".
@ -1744,7 +1759,7 @@ should not be computed on the basis of the following token."
smie-indent-comment smie-indent-comment-continue smie-indent-comment-close
smie-indent-comment-inside smie-indent-inside-string
smie-indent-keyword smie-indent-after-keyword
smie-indent-exps)
smie-indent-empty-line smie-indent-exps)
"Functions to compute the indentation.
Each function is called with no argument, shouldn't move point, and should
return either nil if it has no opinion, or an integer representing the column