Add Java mode.

diff --git a/v7/src/edwin/decls.scm b/v7/src/edwin/decls.scm
index 80fdd4324fa55b6e5c7fb59169c591cc054817a0..c9f23483eade08a1e75d2107626bebcebd29da30 100644 (file)
--- a/v7/src/edwin/decls.scm
+++ b/v7/src/edwin/decls.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: decls.scm,v 1.59 1997/03/07 23:34:40 cph Exp $
+$Id: decls.scm,v 1.60 1998/06/29 04:10:34 cph Exp $
 
-Copyright (c) 1989-97 Massachusetts Institute of Technology
+Copyright (c) 1989-98 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -164,6 +164,7 @@ MIT in each case. |#
                "input"
                "intmod"
                "iserch"
+               "javamode"
                "keymap"
                "keyparse"
                "kilcom"

diff --git a/v7/src/edwin/dosfile.scm b/v7/src/edwin/dosfile.scm
index a2816bbb7ba6fcc178a0c759312fab1b717248f7..d1492c409027dc35bc404383455c9e4e58bfd3a4 100644 (file)
--- a/v7/src/edwin/dosfile.scm
+++ b/v7/src/edwin/dosfile.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Id: dosfile.scm,v 1.16 1998/03/09 05:17:52 cph Exp $
+;;;    $Id: dosfile.scm,v 1.17 1998/06/29 04:14:27 cph Exp $
 ;;;
 ;;;    Copyright (c) 1994-98 Massachusetts Institute of Technology
 ;;;
@@ -446,17 +446,21 @@ Switches may be concatenated, e.g. `-lt' is equivalent to `-l -t'."
 
 (define (os/file-type-to-major-mode)
   (alist-copy
-   `(("asm" . midas)
+   `(("article" . text)
+     ("asm" . midas)
      ("bat" . text)
      ("bib" . text)
      ("c" . c)
+     ("cc" . c)
      ("h" . c)
-     ("m4" . midas)
+     ("java" . java)
      ("pas" . pascal)
      ("s" . scheme)
      ("scm" . scheme)
+     ("text" . text)
      ("txi" . texinfo)
-     ("txt" . text))))
+     ("txt" . text)
+     ("y" . c))))
 
 (define (os/init-file-name)
   (let ((name "edwin.ini"))

diff --git a/v7/src/edwin/ed-ffi.scm b/v7/src/edwin/ed-ffi.scm
index 59dc69b1b69e263dfbbce6c07a7f75b8a6e01418..10009af85ce8ec03ebca8f66a6651aedcfa30bcf 100644 (file)
--- a/v7/src/edwin/ed-ffi.scm
+++ b/v7/src/edwin/ed-ffi.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: ed-ffi.scm,v 1.42 1997/03/07 23:34:42 cph Exp $
+$Id: ed-ffi.scm,v 1.43 1998/06/29 04:10:39 cph Exp $
 
-Copyright (c) 1990-97 Massachusetts Institute of Technology
+Copyright (c) 1990-98 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -167,6 +167,8 @@ of that license should have been included along with this file.
                edwin-syntax-table)
     ("iserch"  (edwin incremental-search)
                edwin-syntax-table)
+    ("javamode"        (edwin)
+               edwin-syntax-table)
     ("key-w32" (edwin win32-keys)
                edwin-syntax-table)
     ("key-x11" (edwin x-keys)

diff --git a/v7/src/edwin/edwin.ldr b/v7/src/edwin/edwin.ldr
index 0ca4cd0208285beabecae950be4c1560a425a4d2..6957f00b1ebb9010832231f1065c863c8dbdeb2b 100644 (file)
--- a/v7/src/edwin/edwin.ldr
+++ b/v7/src/edwin/edwin.ldr
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: edwin.ldr,v 1.61 1998/04/30 21:32:41 cph Exp $
+$Id: edwin.ldr,v 1.62 1998/06/29 04:10:50 cph Exp $
 
 Copyright (c) 1989-98 Massachusetts Institute of Technology
 
@@ -221,6 +221,7 @@ MIT in each case. |#
        (load "bufcom" environment)
        (load "bufmnu" (->environment '(EDWIN BUFFER-MENU)))
        (load "c-mode" environment)
+       (load "javamode" environment)
        (load "cinden" (->environment '(EDWIN C-INDENTATION)))
        (load "comhst" environment)
        (load "comint" environment)

diff --git a/v7/src/edwin/edwin.pkg b/v7/src/edwin/edwin.pkg
index aebfe2961bfcca219c11c351f786baf016bb0238..ed26268a600989e11799524073c3d36dbe2ed200 100644 (file)
--- a/v7/src/edwin/edwin.pkg
+++ b/v7/src/edwin/edwin.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: edwin.pkg,v 1.223 1998/06/28 20:24:15 cph Exp $
+$Id: edwin.pkg,v 1.224 1998/06/29 04:10:43 cph Exp $
 
 Copyright (c) 1989-98 Massachusetts Institute of Technology
 
@@ -96,6 +96,7 @@ MIT in each case. |#
 
         "loadef"                       ; auto-load definitions
         "c-mode"                       ; C mode
+        "javamode"                     ; Java mode
         "midas"                        ; MIDAS mode
         "pasmod"                       ; Pascal mode
         "tximod"                       ; Texinfo mode

diff --git a/v7/src/edwin/unix.scm b/v7/src/edwin/unix.scm
index 2508ad4cc3d71f5b5daacd68f6c5f7d8806a0b76..d7c74c5a40836763d342c31bafde59455887e215 100644 (file)
--- a/v7/src/edwin/unix.scm
+++ b/v7/src/edwin/unix.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Id: unix.scm,v 1.82 1998/02/01 06:42:49 cph Exp $
+;;;    $Id: unix.scm,v 1.83 1998/06/29 04:14:31 cph Exp $
 ;;;
 ;;;    Copyright (c) 1989-98 Massachusetts Institute of Technology
 ;;;
@@ -334,10 +334,12 @@ Includes the new backup.  Must be > 0."
   (alist-copy
    `(("article" . text)
      ("asm" . midas)
+     ("bat" . text)
      ("bib" . text)
      ("c" . c)
      ("cc" . c)
      ("h" . c)
+     ("java" . java)
      ("pas" . pascal)
      ("s" . scheme)
      ("scm" . scheme)