Update indentation to include R7RS keywords.

Also delete obsolete MIT/GNU keywords.

diff --git a/src/edwin/schmod.scm b/src/edwin/schmod.scm
index 54ed279950c49077907ad276b7401640b7f430b6..450d27462f366e90c0e48d64de6a9b97df0f5518 100644 (file)
--- a/src/edwin/schmod.scm
+++ b/src/edwin/schmod.scm
@@ -168,47 +168,37 @@ The following commands evaluate Scheme expressions:
                                           (symbol->string name)
                                           (car entry)))
                      (cdr entry)))
-         `(;; R4RS keywords:
-           (0 BEGIN DELAY)
-           (1 CASE LAMBDA LET* LETREC LET-SYNTAX LETREC-SYNTAX SYNTAX-RULES)
+         `(;; R7RS:
+           (0 BEGIN COND-EXPAND)
+           (1 CALL-WITH-INPUT-FILE CALL-WITH-OUTPUT-FILE CALL-WITH-PORT
+              CALL-WITH-VALUES CASE CASE-LAMBDA GUARD LAMBDA LET* LET*-VALUES
+              LET-SYNTAX LET-VALUES LETREC LETREC* LETREC-SYNTAX PARAMETERIZE
+              UNLESS WHEN WITH-EXCEPTION-HANDLER WITH-INPUT-FROM-FILE
+              WITH-OUTPUT-TO-FILE)
            (2 DO)
-           (,scheme-mode:indent-let-method LET)
-
-           ;; R4RS procedures:
-           (1 CALL-WITH-INPUT-FILE WITH-INPUT-FROM-FILE
-              CALL-WITH-OUTPUT-FILE WITH-OUTPUT-TO-FILE)
+           (3 DEFINE-RECORD-TYPE)
+           (,scheme-mode:indent-let-method LET SYNTAX-RULES)
 
-           ;; SRFI keywords:
+           ;; SRFI
             (1 AND-LET*)
            (2 RECEIVE)
-           (3 DEFINE-RECORD-TYPE)
-
-           ;; MIT/GNU Scheme keywords:
-           (1 DEFINE-STRUCTURE FLUID-LET LET*-SYNTAX LOCAL-DECLARE
-              NAMED-LAMBDA)
 
-           ;; MIT/GNU Scheme procedures:
+           ;; MIT/GNU Scheme:
            (0 CALL-WITH-OUTPUT-STRING WITH-OUTPUT-TO-STRING)
            (1 CALL-WITH-APPEND-FILE CALL-WITH-BINARY-APPEND-FILE
               CALL-WITH-BINARY-INPUT-FILE CALL-WITH-BINARY-OUTPUT-FILE
+              CALL-WITH-INPUT-STRING DEFINE-STRUCTURE FLUID-LET LET*-SYNTAX
+              LIST-OF-TYPE? LOCAL-DECLARE NAMED-LAMBDA VECTOR-OF-TYPE?
               WITH-INPUT-FROM-PORT WITH-INPUT-FROM-STRING WITH-OUTPUT-TO-PORT
-              CALL-WITH-VALUES WITH-VALUES WITHIN-CONTINUATION
-              KEEP-MATCHING-ITEMS KEEP-MATCHING-ITEMS! DELETE-MATCHING-ITEMS
-              DELETE-MATCHING-ITEMS! FIND-MATCHING-ITEM FIND-NON-MATCHING-ITEM
-              COUNT-MATCHING-ITEMS COUNT-NON-MATCHING-ITEMS
-              LIST-TRANSFORM-POSITIVE LIST-TRANSFORM-NEGATIVE
-              LIST-SEARCH-POSITIVE LIST-SEARCH-NEGATIVE
-              FOR-ALL? THERE-EXISTS? LIST-OF-TYPE? VECTOR-OF-TYPE?
-              CALL-WITH-INPUT-STRING)
-           (2 WITH-SIMPLE-RESTART BIND-CONDITION-HANDLER)
+              WITHIN-CONTINUATION)
+           (2 BIND-CONDITION-HANDLER WITH-SIMPLE-RESTART)
            (3 MAKE-CONDITION-TYPE)
            (4 WITH-RESTART)))
 
 (define scheme-mode:indent-regexps
   `(SCHEME-MODE:INDENT-REGEXPS
     ("DEFAULT" . #F)
-    ("DEF" . DEFINITION)
-    ("WITH-" . 1)))
+    ("DEF" . DEFINITION)))
 \f
 ;;;; Completion