Mercurial > urweb

changeset 1747:9b54fbe1efdb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjust error message format to match Emacs defaults
author Adam Chlipala <adam@chlipala.net>
date Sat, 05 May 2012 19:57:54 -0400
parents 1dd8a8791d9c
children 95dd9f427bb2
files src/elisp/urweb-mode.el src/errormsg.sml
diffstat 2 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/elisp/urweb-mode.el	Sat May 05 13:08:26 2012 -0400
+++ b/src/elisp/urweb-mode.el	Sat May 05 19:57:54 2012 -0400
@@ -67,6 +67,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
+(require 'compile)
 (require 'urweb-util)
 (require 'urweb-move)
 (require 'urweb-defs)
@@ -394,6 +395,8 @@
   ;; Compatibility.  FIXME: we should use `-' in Emacs-CVS.
   (unless (boundp 'skeleton-positions) (set (make-local-variable '@) nil))
 
+  (local-set-key (kbd "C-c C-c") 'compile)
+
   (urweb-mode-variables))
 
 (defun urweb-mode-variables ()
@@ -903,8 +906,6 @@
 	(urweb-skip-siblings))
       fullname)))
 
-
-
 (provide 'urweb-mode)
 
 ;;; urweb-mode.el ends here
--- a/src/errormsg.sml	Sat May 05 13:08:26 2012 -0400
+++ b/src/errormsg.sml	Sat May 05 19:57:54 2012 -0400
@@ -1,4 +1,4 @@
-(* Copyright (c) 2008, Adam Chlipala
+(* Copyright (c) 2008, 2012, Adam Chlipala
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -94,8 +94,13 @@
 fun error s = (TextIO.output (TextIO.stdErr, s);
                TextIO.output1 (TextIO.stdErr, #"\n");
                errors := true)
-fun errorAt span s = (TextIO.output (TextIO.stdErr, spanToString span);
-                      TextIO.output (TextIO.stdErr, ": ");
+
+fun errorAt span s = (TextIO.output (TextIO.stdErr, #file span);
+                      TextIO.output (TextIO.stdErr, ":");
+                      TextIO.output (TextIO.stdErr, posToString (#first span));
+                      TextIO.output (TextIO.stdErr, ": (to ");
+                      TextIO.output (TextIO.stdErr, posToString (#last span));
+                      TextIO.output (TextIO.stdErr, ") ");
                       error s)
 fun errorAt' span s = errorAt (spanOf span) s