Add some new scheme features (tiny change)

* lisp/progmodes/scheme.el (scheme-font-lock-keywords-2):
Add export, import, library.
(library): Set indent function.

Fixes: debbugs:9164

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2605247244a296c853f7fa12a02c39bf7d65eddd..783cd2d864b226bd4fb172b32a58d03a1522c9e1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-15  Simen Heggestøyl  <simenheg@ifi.uio.no>  (tiny change)
+
+       * progmodes/scheme.el (scheme-font-lock-keywords-2):
+       Add export, import, library.  (Bug#9164)
+       (library): Set indent function.
+
 2013-06-14  Glenn Morris  <rgm@gnu.org>
 
        * term/xterm.el (xterm--query):

diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el
index fab20102097852bc965b605b837f3d167aa9d045..fda7d6b6852673af48befb5ff7dd6ba12ad53d1c 100644 (file)
--- a/lisp/progmodes/scheme.el
+++ b/lisp/progmodes/scheme.el
@@ -312,6 +312,8 @@ See `run-hooks'."
               "call-with-input-file" "call-with-output-file" "case" "cond"
               "do" "else" "for-each" "if" "lambda" "λ"
               "let" "let*" "let-syntax" "letrec" "letrec-syntax"
+              ;; R6RS library subforms.
+              "export" "import"
               ;; SRFI 11 usage comes up often enough.
               "let-values" "let*-values"
               ;; Hannes Haug <hannes.haug@student.uni-tuebingen.de> wants:
@@ -330,6 +332,10 @@ See `run-hooks'."
       ;;
       ;; Scheme `:' and `#:' keywords as builtins.
       '("\\<#?:\\sw+\\>" . font-lock-builtin-face)
+      ;; R6RS library declarations.
+      '("(\\(\\<library\\>\\)\\s-*(?\\(\\sw+\\)?"
+       (1 font-lock-keyword-face)
+       (2 font-lock-type-face))
       )))
   "Gaudy expressions to highlight in Scheme modes.")
 
@@ -536,6 +542,7 @@ indentation."
 (put 'letrec-syntax 'scheme-indent-function 1)
 (put 'syntax-rules 'scheme-indent-function 1)
 (put 'syntax-case 'scheme-indent-function 2) ; not r5rs
+(put 'library 'scheme-indent-function 1) ; R6RS
 
 (put 'call-with-input-file 'scheme-indent-function 1)
 (put 'with-input-from-file 'scheme-indent-function 1)