summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2015-10-09 15:30:27 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2015-10-09 15:30:27 -0400
commitd72d97fcbe4f9a989d3f214eed8036bd52ff0141 (patch)
treee0ce2cdc87cd0628ca00803b1f1229aeeeed4c4a
parentaf45926d66d303fdc4c2c3ebbc820b4a54d9e4a0 (diff)
downloademacs-d72d97fcbe4f9a989d3f214eed8036bd52ff0141.tar.gz
emacs-d72d97fcbe4f9a989d3f214eed8036bd52ff0141.tar.bz2
emacs-d72d97fcbe4f9a989d3f214eed8036bd52ff0141.zip
* lisp/progmodes/prolog.el: Avoid indenting too much, after ":-"
(prolog-smie-rules): Try and avoid indenting too far after ":-".
-rw-r--r--lisp/progmodes/prolog.el11
1 files changed, 10 insertions, 1 deletions
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 81aeb8d0f81..61d3a3c638b 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -988,7 +988,16 @@ This is really kludgy, and unneeded (i.e. obsolete) in Emacs>=24."
(smie-indent-backward-token) ;Skip !
(equal ":-" (car (smie-indent-backward-token))))
(smie-rule-parent prolog-indent-width)))
- (`(:after . ,(or `":-" `"-->")) prolog-indent-width)))
+ (`(:after . ":-")
+ (if (bolp)
+ (save-excursion
+ (smie-indent-forward-token)
+ (skip-chars-forward " \t")
+ (if (eolp)
+ prolog-indent-width
+ (min prolog-indent-width (current-column))))
+ prolog-indent-width))
+ (`(:after . "-->") prolog-indent-width)))
;;-------------------------------------------------------------------