From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 9 Oct 2015 19:30:27 +0000 (-0400)
Subject: * lisp/progmodes/prolog.el: Avoid indenting too much, after ":-"
X-Git-Tag: emacs-25.0.90~1183
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d72d97fcbe4f9a989d3f214eed8036bd52ff0141;p=emacs.git

* lisp/progmodes/prolog.el: Avoid indenting too much, after ":-"

(prolog-smie-rules): Try and avoid indenting too far after ":-".
---

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)))
 
 
 ;;-------------------------------------------------------------------