Little clean-ups to the indentation rules

Splitting better the specially indented forms between our two
implementations, so that users of a single one don't get weird
indentations for froms without a special meaning in their scheme.

Ideally, we should make these indentation rules buffer-local, so that
when a user is in a, say, Guile buffer, module+ has no special
indentation (as is the case now if that user also has activated
support for Racket).

2 files changed, 3 insertions, 36 deletions

diff --git a/NEWS b/NEWS
index 37bb7ce..290d0b3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 * Version 0.2.3 ()
 
+  - Indentation of scheme forms improved (specially for those of you
+    using a single implementation).
+
 
 * Version 0.2.2 (Sep 30, 2012)
 
diff --git a/elisp/geiser-syntax.el b/elisp/geiser-syntax.el
index 162d909..46ee350 100644
--- a/elisp/geiser-syntax.el
+++ b/elisp/geiser-syntax.el
@@ -28,60 +28,24 @@
                     pairs)))
 
 (geiser-syntax--scheme-indent
- (begin0 1)
- (c-declare 0)
- (c-lambda 2)
  (case-lambda 0)
- (case-lambda: 0)
  (catch defun)
  (class defun)
- (class* defun)
- (compound-unit/sig 0)
- (define: defun)
  (dynamic-wind 0)
- (instantiate 2)
- (interface 1)
- (lambda: 1)
- (lambda/kw 1)
  (let*-values 1)
- (let*-values: 1)
- (let+ 1)
- (let: 1)
- (letrec: 1)
  (letrec* 1)
  (letrec-values 1)
- (letrec-values: 1)
  (let-values 1)
- (let-values: 1)
- (let/cc: 1)
  (let/ec 1)
  (match defun)
- (mixin 2)
- (module defun)
  (opt-lambda 1)
  (parameterize 1)
- (parameterize-break 1)
  (parameterize* 1)
- (pmatch defun)
- (quasisyntax/loc 1)
  (receive 2)
- (send* 1)
- (sigaction 1)
  (syntax-case 2)
- (syntax-id-rules defun)
- (syntax/loc 1)
- (type-case defun)
- (unit defun)
- (unit/sig 2)
  (unless 1)
  (when 1)
  (while 1)
- (with-fluid* 1)
- (with-fluids 1)
- (with-fluids* 1)
- (with-handlers 1)
- (with-handlers: 1)
- (with-method 1)
  (with-error-to-port 1)
  (with-syntax 1))