(no commit message)

diff --git a/ChangeLog b/ChangeLog
index e505988851b970abf09f3f9121b3bd357f659e70..360655a18d69b79cc9ee2172310abc33adf10cf3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * testcases.sml: Add (old) buggy case from Christopher Dutchyn.
+
+       * sml-proc.el (inferior-sml-font-lock-keywords): Don't add
+       error-regexps if compile.el already highlights them anyway.
+
+       * sml-mode.el (sml-font-lock-symbols-alist): Fix char for "not".
+
 2007-10-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * sml-mode.el (sml-def-skeleton): If possible, only expand for

diff --git a/sml-mode.el b/sml-mode.el
index 35abcea34e11e6f839b3d53a7888d53230b2347d..2c3c4836b50bda7aaa8a7e8826060cec9e621d1b 100644 (file)
--- a/sml-mode.el
+++ b/sml-mode.el
@@ -217,7 +217,7 @@ and `unicode'."
              (cons "andalso" (decode-char 'ucs 8896))
              (cons "orelse" (decode-char 'ucs 8897))
              ;; (cons "as" (decode-char 'ucs 8801))
-             (cons "not" (decode-char 'ucs 160))
+             (cons "not" (decode-char 'ucs 172))
              (cons "div" (decode-char 'ucs 247))
              (cons "*" (decode-char 'ucs 215))
              (cons "o"  (decode-char 'ucs 9675))

diff --git a/sml-proc.el b/sml-proc.el
index a5731973060a2a02d26cb10eb9d0b3c9b0eaf7f7..b62628a5b442b7f39b0c6c3b081d9cc80d567712 100644 (file)
--- a/sml-proc.el
+++ b/sml-proc.el
@@ -228,6 +228,7 @@ See `compilation-error-regexp-alist' for a description of the format.")
 ;; font-lock support
 (defconst inferior-sml-font-lock-keywords
   `(;; prompt and following interactive command
+    ;; FIXME: Actually, this should already be taken care of by comint.
     (,(concat "\\(" sml-prompt-regexp "\\)\\(.*\\)")
      (1 font-lock-prompt-face)
      (2 font-lock-command-face keep))
@@ -236,8 +237,9 @@ See `compilation-error-regexp-alist' for a description of the format.")
     ;; SML/NJ's irritating GC messages
     ("^GC #.*" . font-lock-comment-face)
     ;; error messages
-    ,@(mapcar (lambda (ra) (cons (car ra) 'font-lock-warning-face))
-             sml-error-regexp-alist))
+    ,@(unless (fboundp 'compilation-fake-loc)
+        (mapcar (lambda (ra) (cons (car ra) 'font-lock-warning-face))
+                sml-error-regexp-alist)))
   "Font-locking specification for inferior SML mode.")
 
 (defface font-lock-prompt-face

diff --git a/testcases.sml b/testcases.sml
index 26a2ccf6b3792952bd391dc3613aa5d3a6087ced..532099718fe19e9c269819ed9be0c0d693752172 100644 (file)
--- a/testcases.sml
+++ b/testcases.sml
@@ -1,10 +1,15 @@
-(* Copyright 1999, 2004 Stefan Monnier <monnier@gnu.org> *)
+(* Copyright 1999, 2004, 2007 Stefan Monnier <monnier@gnu.org> *)
 
 (let val a = 1 val b = 2
      val c = 3
  in 1
  end);
 
+(* From "Christopher Dutchyn" <cdutchyn@cs.ubc.ca> *)
+(case foo of
+  (* FIXME: The line gets unindented by 2 every time you hit TAB :-( *)
+  | BAR => baz)
+
 (* sml-mode here treats the second `=' as an equal op because it assumes
  * that the first is the definitional equal for the structure.  FIXME!  *)
 functor foo (structure s : S) where type t = s.t =