(sml-make-error): Use match-string.

diff --git a/ChangeLog b/ChangeLog
index de1bc5f09567fac1a0a758d7a915a89f24937dfa..d90e38c75d9014a5e7e07abcd82287d477c9c15d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,16 @@
+2004-11-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * Makefile (install_startup): Don't add to load-path any more.
+
+       * sml-proc.el (sml-make-error): Use match-string.
+
 2004-04-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * testcases.sml: Add a nasty case that is still wrong.
 
        * sml-proc.el (sml-error-regexp-alist): Tune the regexp for sml/nj.
 
-       * sml-mode.el (sml-mode): Batter handle paragraphs in comments.
+       * sml-mode.el (sml-mode): Better handle paragraphs in comments.
        (sml-mode-variables): Clean up paragraph settings.
        (sml-electric-pipe): Fix a boundary bug.
        (sml-indent-starter, sml-get-sym-indent, sml-find-matching-starter):

diff --git a/INSTALL b/INSTALL
index b125735d362b6b7245a6f9bc8590be2aa099fec8..6fb7e67d704cbd6b9039fa6b0a55e85a82cdef47 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -11,29 +11,24 @@ Installation of the program
 
   2. Have some sorbet.
 
-  3. Type `make install' in the source directory.  This will
-     byte-compile all `.el' files and copy all the
-     `.elc' files into the directory you specified in step 1.
-     It will also copy the info files (and add a corresponding entry to the
-     info-dir file if install-info can be found).
+  3. Type `make install' in the source directory.  This will byte-compile
+     all `.el' files and copy all into the directory you specified in step
+     1.  It will also copy the info files (and add a corresponding entry to
+     the info-dir file if install-info can be found).
 
-     If you want to install the `.el' files,
-     just type ``make install_el''.
-
-     If you only want to create the compiled elisp files, but don't
-     want to install them, you can type `make elcfiles' instead.
+     If you only want to create the compiled elisp files, you can just type
+     `make elcfiles' instead.
 
   4. Edit the file `site-start.el' in your emacs lisp directory (usually
-     `/usr/local/share/emacs/site-lisp' or something similar) and enter the
-     contents of the file `sml-mode-startup.el' into it.  It contains
-     a couple of `auto-load's that facilitates the use of sml-mode.
-     Alternatively, you can just use `make install_startup'.
-     If you're only installing it for yourself rather than for the whole system,
-     then use something like `make install_startup startupfile=$HOME/.emacs'.
+     `/usr/local/share/emacs/site-lisp' or something similar) and make it
+     load the file `sml-mode-startup.el'.  It contains a couple of
+     `auto-load's that facilitates the use of sml-mode.  Alternatively, you
+     can just use `make install_startup'.  If you're only installing it for
+     yourself rather than for the whole system, then use something like
+     `make install_startup startupfile=$HOME/.emacs'.
 
-  5. If you already had copied the pcl-cvs.startup.el file to your
-     site-start.el (or .emacs), you might want to check if it is still correct
-     since autoloads might have been added/removed.
+  5. If you had copied the contents of a previous sml-mode-startup.el file to
+     your site-start.el (or .emacs), you might want to remove that.
 
 
 How to make typeset documentation from the TeXinfo manual
@@ -42,6 +37,3 @@ How to make typeset documentation from the TeXinfo manual
    If you have TeX installed at your site, you can make a typeset version of
 the manual typing ``make dvi''.  If you prefer a postscript version of this
 file, just use ``make postscript''.
-
-
-#ident @(#)$Name$:$Id$

diff --git a/sml-mode.el b/sml-mode.el
index 246089fd5fd977a0569b0c14e6ace3699696ad42..13e6716d2258f6589110da1e662f2454eb51cbb2 100644 (file)
--- a/sml-mode.el
+++ b/sml-mode.el
@@ -308,7 +308,7 @@ This mode runs `sml-mode-hook' just before exiting.
   (set (make-local-variable 'forward-sexp-function) 'sml-user-forward-sexp)
   ;; For XEmacs
   (easy-menu-add sml-mode-menu)
-  ;; Compatibility
+  ;; Compatibility.  FIXME: we should use `-' in Emacs-CVS.
   (unless (boundp 'skeleton-positions) (set (make-local-variable '@) nil))
   (sml-mode-variables))
 

diff --git a/sml-proc.el b/sml-proc.el
index 40156ae9a6b9e667e710d78be4f87e3b2951ed20..b74860ca28f32066ae8ff47879fdb906cb3e4428 100644 (file)
--- a/sml-proc.el
+++ b/sml-proc.el
@@ -634,14 +634,14 @@ non-nil.  With prefix arg, always prompts."
   (let ((err (point-marker))
        (linenum (string-to-number c))
        (filename (list (first f) (second f)))
-       (column (string-to-number (compile-buffer-substring (third f)))))
+       (column (string-to-number (match-string (third f)))))
     ;; record the end of error, if any
     (when (fourth f)
-      (let ((endlinestr (compile-buffer-substring (fourth f))))
+      (let ((endlinestr (match-string (fourth f))))
        (when endlinestr
          (let* ((endline (string-to-number endlinestr))
                 (endcol (string-to-number
-                         (or (compile-buffer-substring (fifth f)) "0")))
+                         (or (match-string (fifth f)) "0")))
                 (linediff (- endline linenum)))
            (push (list err linediff (if (= 0 linediff) (- endcol column) endcol))
                  sml-endof-error-alist)))))