Merge commit 'c7e65ca646a7fff43df94bb5f95d9953345ef666'

[gnu-emacs-elpa] / packages / sml-mode / sml-mode.el

diff --git a/packages/sml-mode/sml-mode.el b/packages/sml-mode/sml-mode.el
index 4cca12745c581f689ac7c99566932308df6f802e..85fcdcf2a1d7f947988e4b9779a2961c923d8418 100644 (file)
--- a/packages/sml-mode/sml-mode.el
+++ b/packages/sml-mode/sml-mode.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1989,1999,2000,2004,2007,2010-2015  Free Software Foundation, Inc.
 
 ;; Maintainer: (Stefan Monnier) <monnier@iro.umontreal.ca>
-;; Version: 6.6
+;; Version: 6.7
 ;; Keywords: SML
 ;; Author:     Lars Bo Nielsen
 ;;             Olin Shivers
@@ -532,8 +532,9 @@ Regexp match data 0 points to the chars."
      (if (and (smie-rule-parent-p "val") (smie-rule-next-p "fn")) -3))
     (`(:before . "=>") (if (smie-rule-parent-p "fn") 3))
     (`(:before . "of") 1)
-    ;; In case the language is extended to allow a | directly after of.
-    (`(:before . ,(and `"|" (guard (smie-rule-prev-p "of")))) 1)
+    ;; FIXME: pcase in Emacs<24.4 bumps into a bug if we do this:
+    ;;(`(:before . ,(and `"|" (guard (smie-rule-prev-p "of")))) 1)
+    (`(:before . "|") (if (smie-rule-prev-p "of") 1 (smie-rule-separator kind)))
     (`(:before . ,(or `"|" `"d|" `";" `",")) (smie-rule-separator kind))
     ;; Treat purely syntactic block-constructs as being part of their parent,
     ;; when the opening statement is hanging.