Home My Page Projects Code Snippets Project Openings SML/NJ
Summary Activity Forums Tracker Lists Tasks Docs Surveys News SCM Files

SCM Repository

[smlnj] Diff of /sml-mode/trunk/sml-mode.el
ViewVC logotype

Diff of /sml-mode/trunk/sml-mode.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2816, Tue Oct 30 18:39:53 2007 UTC revision 2817, Wed Oct 31 04:07:04 2007 UTC
# Line 21  Line 21 
21    
22  ;; This program is free software; you can redistribute it and/or  ;; This program is free software; you can redistribute it and/or
23  ;; modify it under the terms of the GNU General Public License as  ;; modify it under the terms of the GNU General Public License as
24  ;; published by the Free Software Foundation; either version 2, or (at  ;; published by the Free Software Foundation; either version 3, or (at
25  ;; your option) any later version.  ;; your option) any later version.
26    
27  ;; This program is distributed in the hope that it will be useful, but  ;; This program is distributed in the hope that it will be useful, but
# Line 159  Line 159 
159  ;; font-lock setup  ;; font-lock setup
160    
161  (defconst sml-keywords-regexp  (defconst sml-keywords-regexp
162    (sml-syms-re "abstraction" "abstype" "and" "andalso" "as" "before" "case"    (sml-syms-re '("abstraction" "abstype" "and" "andalso" "as" "before" "case"
163                 "datatype" "else" "end" "eqtype" "exception" "do" "fn"                 "datatype" "else" "end" "eqtype" "exception" "do" "fn"
164                 "fun" "functor" "handle" "if" "in" "include" "infix"                 "fun" "functor" "handle" "if" "in" "include" "infix"
165                 "infixr" "let" "local" "nonfix" "of" "op" "open" "orelse"                 "infixr" "let" "local" "nonfix" "of" "op" "open" "orelse"
166                 "overload" "raise" "rec" "sharing" "sig" "signature"                 "overload" "raise" "rec" "sharing" "sig" "signature"
167                 "struct" "structure" "then" "type" "val" "where" "while"                 "struct" "structure" "then" "type" "val" "where" "while"
168                 "with" "withtype" "o")                   "with" "withtype" "o"))
169    "A regexp that matches any and all keywords of SML.")    "A regexp that matches any and all keywords of SML.")
170    
171  (defconst sml-tyvarseq-re  (defconst sml-tyvarseq-re
# Line 559  Line 559 
559    
560          ;; Continued string ? (Added 890113 lbn)          ;; Continued string ? (Added 890113 lbn)
561          (and (looking-at "\\\\")          (and (looking-at "\\\\")
562                 (or (save-excursion (forward-line -1)
563                                     (if (looking-at "[\t ]*\\\\")
564                                         (current-indentation)))
565               (save-excursion               (save-excursion
                (if (save-excursion (previous-line 1)  
                                    (beginning-of-line)  
                                    (looking-at "[\t ]*\\\\"))  
                    (progn (previous-line 1) (current-indentation))  
566                   (if (re-search-backward "[^\\\\]\"" nil t)                   (if (re-search-backward "[^\\\\]\"" nil t)
567                       (1+ (current-column))                       (1+ (current-column))
568                     0))))                     0))))
# Line 1001  Line 1000 
1000       ,@(if (fboundp 'compilation-fake-loc) '((1))))))       ,@(if (fboundp 'compilation-fake-loc) '((1))))))
1001    
1002  (eval-after-load "compile"  (eval-after-load "compile"
1003    '(dolist ((x sml-mlton-error-regexp-alist))    '(dolist (x sml-mlton-error-regexp-alist)
1004       (add-to-list 'compilation-error-regexp-alist x)))       (add-to-list 'compilation-error-regexp-alist x)))
1005    
1006  (defun sml-mlton-typecheck (mainfile)  (defun sml-mlton-typecheck (mainfile)
# Line 1066  Line 1065 
1065        (with-current-buffer (find-file-noselect (sml-defuse-file))        (with-current-buffer (find-file-noselect (sml-defuse-file))
1066          (goto-char (point-min))          (goto-char (point-min))
1067          (unless (re-search-forward          (unless (re-search-forward
1068                   (format sml-defuse-use-format                   (format sml-defuse-use-regexp-format
1069                           (concat "\\(?:"                           (concat "\\(?:"
1070                                   ;; May be an absolute file name.                                   ;; May be an absolute file name.
1071                                   (regexp-quote (nth 3 symdata))                                   (regexp-quote (nth 3 symdata))

Legend:
Removed from v.2816  
changed lines
  Added in v.2817

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0