From 0f07a0da670deede3156f05f9e0a258264c84f75 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 18 Dec 2001 22:12:39 +0000
Subject: [PATCH] Use MAKE-CHAR-SYNTAX-TABLE rather than MAKE-SYNTAX-TABLE.

---
 v7/src/edwin/c-mode.scm   | 19 +++++++++---------
 v7/src/edwin/htmlmode.scm | 21 ++++++++++----------
 v7/src/edwin/javamode.scm | 17 ++++++++--------
 v7/src/edwin/midas.scm    | 23 +++++++++++----------
 v7/src/edwin/pasmod.scm   | 39 ++++++++++++++++++------------------
 v7/src/edwin/schmod.scm   | 42 +++++++++++++++++++--------------------
 v7/src/edwin/syntax.scm   |  8 ++++----
 v7/src/edwin/texcom.scm   | 23 +++++++++++----------
 v7/src/edwin/tximod.scm   | 19 +++++++++---------
 v7/src/edwin/verilog.scm  | 25 ++++++++++++-----------
 v7/src/edwin/vhdl.scm     | 21 ++++++++++----------
 11 files changed, 133 insertions(+), 124 deletions(-)

diff --git a/v7/src/edwin/c-mode.scm b/v7/src/edwin/c-mode.scm
index 3b3d97059..734374a6b 100644
--- a/v7/src/edwin/c-mode.scm
+++ b/v7/src/edwin/c-mode.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: c-mode.scm,v 1.59 2000/03/02 05:31:58 cph Exp $
+;;; $Id: c-mode.scm,v 1.60 2001/12/18 22:12:16 cph Exp $
 ;;;
-;;; Copyright (c) 1986, 1989-2000 Massachusetts Institute of Technology
+;;; Copyright (c) 1986, 1989-2001 Massachusetts Institute of Technology
 ;;;
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU General Public License as
@@ -16,7 +16,8 @@
 ;;;
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program; if not, write to the Free Software
-;;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;;; 02111-1307, USA.
 
 ;;;; C Mode (from GNU Emacs)
 
@@ -97,13 +98,13 @@ Settings for K&R and BSD indentation styles are
   (make-event-distributor))
 
 (define c-syntax-table
-  (let ((syntax-table (make-syntax-table)))
-    (for-each (lambda (char) (modify-syntax-entry! syntax-table char "."))
+  (let ((syntax-table (make-char-syntax-table)))
+    (for-each (lambda (char) (set-char-syntax! syntax-table char "."))
 	      (string->list "+-=%<>&|"))
-    (modify-syntax-entry! syntax-table #\' "\"")
-    (modify-syntax-entry! syntax-table #\\ "\\")
-    (modify-syntax-entry! syntax-table #\/ ". 14")
-    (modify-syntax-entry! syntax-table #\* ". 23")
+    (set-char-syntax! syntax-table #\' "\"")
+    (set-char-syntax! syntax-table #\\ "\\")
+    (set-char-syntax! syntax-table #\/ ". 14")
+    (set-char-syntax! syntax-table #\* ". 23")
     syntax-table))
 
 (define (c-comment-locate start)
diff --git a/v7/src/edwin/htmlmode.scm b/v7/src/edwin/htmlmode.scm
index 1db2af6d3..3f50d68a9 100644
--- a/v7/src/edwin/htmlmode.scm
+++ b/v7/src/edwin/htmlmode.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: htmlmode.scm,v 1.4 2000/09/06 15:15:40 cph Exp $
+;;; $Id: htmlmode.scm,v 1.5 2001/12/18 22:12:18 cph Exp $
 ;;;
-;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
+;;; Copyright (c) 1999-2001 Massachusetts Institute of Technology
 ;;;
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU General Public License as
@@ -16,7 +16,8 @@
 ;;;
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program; if not, write to the Free Software
-;;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;;; 02111-1307, USA.
 
 ;;;; Major Mode for HTML
 
@@ -64,12 +65,12 @@
   (make-event-distributor))
 
 (define html-syntax-table
-  (let ((syntax-table (make-syntax-table text-mode:syntax-table)))
-    (modify-syntax-entry! syntax-table #\< "(>1")
-    (modify-syntax-entry! syntax-table #\! ". 2")
-    (modify-syntax-entry! syntax-table #\- "_ 3")
-    (modify-syntax-entry! syntax-table #\> ")<4")
-    (modify-syntax-entry! syntax-table #\" "\"\"")
+  (let ((syntax-table (make-char-syntax-table text-mode:syntax-table)))
+    (set-char-syntax! syntax-table #\< "(>1")
+    (set-char-syntax! syntax-table #\! ". 2")
+    (set-char-syntax! syntax-table #\- "_ 3")
+    (set-char-syntax! syntax-table #\> ")<4")
+    (set-char-syntax! syntax-table #\" "\"\"")
     syntax-table))
 
 (define (html-comment-locate mark)
@@ -78,4 +79,4 @@
 
 (define (html-comment-indentation mark)
   mark
-  0)
+  0)
\ No newline at end of file
diff --git a/v7/src/edwin/javamode.scm b/v7/src/edwin/javamode.scm
index 8301b54a1..870ec5a03 100644
--- a/v7/src/edwin/javamode.scm
+++ b/v7/src/edwin/javamode.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: javamode.scm,v 1.10 2000/02/29 03:59:31 cph Exp $
+;;; $Id: javamode.scm,v 1.11 2001/12/18 22:12:20 cph Exp $
 ;;;
-;;; Copyright (c) 1998-2000 Massachusetts Institute of Technology
+;;; Copyright (c) 1998-2001 Massachusetts Institute of Technology
 ;;;
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU General Public License as
@@ -16,7 +16,8 @@
 ;;;
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program; if not, write to the Free Software
-;;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;;; 02111-1307, USA.
 
 ;;;; Major Mode for Java Programs
 
@@ -65,9 +66,9 @@ This is just like C mode, except that
   (make-event-distributor))
 
 (define java-syntax-table
-  (let ((syntax-table (make-syntax-table c-syntax-table)))
-    (modify-syntax-entry! syntax-table #\/ ". 1456")
-    (modify-syntax-entry! syntax-table #\newline ">")
+  (let ((syntax-table (make-char-syntax-table c-syntax-table)))
+    (set-char-syntax! syntax-table #\/ ". 1456")
+    (set-char-syntax! syntax-table #\newline ">")
     syntax-table))
 
 (define (java-comment-locate mark)
@@ -124,6 +125,6 @@ This is just like C mode, except that
   (make-event-distributor))
 
 (define php-syntax-table
-  (let ((syntax-table (make-syntax-table java-syntax-table)))
-    (modify-syntax-entry! syntax-table #\$ ". p")
+  (let ((syntax-table (make-char-syntax-table java-syntax-table)))
+    (set-char-syntax! syntax-table #\$ ". p")
     syntax-table))
\ No newline at end of file
diff --git a/v7/src/edwin/midas.scm b/v7/src/edwin/midas.scm
index c0096c6c4..aaa8259cb 100644
--- a/v7/src/edwin/midas.scm
+++ b/v7/src/edwin/midas.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: midas.scm,v 1.21 2000/03/02 05:31:48 cph Exp $
+;;; $Id: midas.scm,v 1.22 2001/12/18 22:12:23 cph Exp $
 ;;;
-;;; Copyright (c) 1986, 1989-2000 Massachusetts Institute of Technology
+;;; Copyright (c) 1986, 1989-2001 Massachusetts Institute of Technology
 ;;;
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU General Public License as
@@ -16,7 +16,8 @@
 ;;;
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program; if not, write to the Free Software
-;;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;;; 02111-1307, USA.
 
 ;;;; Midas Mode
 
@@ -43,14 +44,14 @@
 			 buffer)
     (event-distributor/invoke! (ref-variable midas-mode-hook buffer) buffer)))
 
-(define midas-mode:syntax-table (make-syntax-table))
-(modify-syntax-entry! midas-mode:syntax-table #\; "<   ")
-(modify-syntax-entry! midas-mode:syntax-table #\newline ">   ")
-(modify-syntax-entry! midas-mode:syntax-table #\. "w   ")
-(modify-syntax-entry! midas-mode:syntax-table #\' "'   ")
-(modify-syntax-entry! midas-mode:syntax-table #\$ "'   ")
-(modify-syntax-entry! midas-mode:syntax-table #\% "'   ")
-(modify-syntax-entry! midas-mode:syntax-table #\# "'   ")
+(define midas-mode:syntax-table (make-char-syntax-table))
+(set-char-syntax! midas-mode:syntax-table #\; "<   ")
+(set-char-syntax! midas-mode:syntax-table #\newline ">   ")
+(set-char-syntax! midas-mode:syntax-table #\. "w   ")
+(set-char-syntax! midas-mode:syntax-table #\' "'   ")
+(set-char-syntax! midas-mode:syntax-table #\$ "'   ")
+(set-char-syntax! midas-mode:syntax-table #\% "'   ")
+(set-char-syntax! midas-mode:syntax-table #\# "'   ")
 
 (define (midas-comment-indentation mark)
   (if (match-forward ";;;" mark)
diff --git a/v7/src/edwin/pasmod.scm b/v7/src/edwin/pasmod.scm
index e1676b281..27927b94b 100644
--- a/v7/src/edwin/pasmod.scm
+++ b/v7/src/edwin/pasmod.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: pasmod.scm,v 1.50 2000/03/02 05:31:51 cph Exp $
+;;; $Id: pasmod.scm,v 1.51 2001/12/18 22:12:25 cph Exp $
 ;;;
-;;; Copyright (c) 1986, 1989-2000 Massachusetts Institute of Technology
+;;; Copyright (c) 1986, 1989-2001 Massachusetts Institute of Technology
 ;;;
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU General Public License as
@@ -16,7 +16,8 @@
 ;;;
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program; if not, write to the Free Software
-;;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;;; 02111-1307, USA.
 
 ;;;; Pascal Mode
 
@@ -49,22 +50,22 @@
 			 buffer)
     (event-distributor/invoke! (ref-variable pascal-mode-hook buffer) buffer)))
 
-(define pascal-mode:syntax-table (make-syntax-table))
-(modify-syntax-entry! pascal-mode:syntax-table #\( "()1 ")
-(modify-syntax-entry! pascal-mode:syntax-table #\) ")( 4")
-(modify-syntax-entry! pascal-mode:syntax-table #\[ "(]  ")
-(modify-syntax-entry! pascal-mode:syntax-table #\] ")[  ")
-(modify-syntax-entry! pascal-mode:syntax-table #\{ "<   ")
-(modify-syntax-entry! pascal-mode:syntax-table #\} ">   ")
-(modify-syntax-entry! pascal-mode:syntax-table #\' "\"   ")
-(modify-syntax-entry! pascal-mode:syntax-table #\$ "\"   ")
-(modify-syntax-entry! pascal-mode:syntax-table #\* "_ 23")
-(modify-syntax-entry! pascal-mode:syntax-table #\. "_   ")
-(modify-syntax-entry! pascal-mode:syntax-table #\^ "_   ")
-(modify-syntax-entry! pascal-mode:syntax-table #\@ "'   ")
-(modify-syntax-entry! pascal-mode:syntax-table #\% "    ")
-(modify-syntax-entry! pascal-mode:syntax-table #\" "    ")
-(modify-syntax-entry! pascal-mode:syntax-table #\\ "    ")
+(define pascal-mode:syntax-table (make-char-syntax-table))
+(set-char-syntax! pascal-mode:syntax-table #\( "()1 ")
+(set-char-syntax! pascal-mode:syntax-table #\) ")( 4")
+(set-char-syntax! pascal-mode:syntax-table #\[ "(]  ")
+(set-char-syntax! pascal-mode:syntax-table #\] ")[  ")
+(set-char-syntax! pascal-mode:syntax-table #\{ "<   ")
+(set-char-syntax! pascal-mode:syntax-table #\} ">   ")
+(set-char-syntax! pascal-mode:syntax-table #\' "\"   ")
+(set-char-syntax! pascal-mode:syntax-table #\$ "\"   ")
+(set-char-syntax! pascal-mode:syntax-table #\* "_ 23")
+(set-char-syntax! pascal-mode:syntax-table #\. "_   ")
+(set-char-syntax! pascal-mode:syntax-table #\^ "_   ")
+(set-char-syntax! pascal-mode:syntax-table #\@ "'   ")
+(set-char-syntax! pascal-mode:syntax-table #\% "    ")
+(set-char-syntax! pascal-mode:syntax-table #\" "    ")
+(set-char-syntax! pascal-mode:syntax-table #\\ "    ")
 
 (define (pascal-comment-locate mark)
   (if (re-search-forward "\\((\\*\\|{\\)[ \t]*" mark (line-end mark 0))
diff --git a/v7/src/edwin/schmod.scm b/v7/src/edwin/schmod.scm
index 6d3df1712..5846e461e 100644
--- a/v7/src/edwin/schmod.scm
+++ b/v7/src/edwin/schmod.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: schmod.scm,v 1.53 2001/11/02 17:10:33 cph Exp $
+;;; $Id: schmod.scm,v 1.54 2001/12/18 22:12:27 cph Exp $
 ;;;
 ;;; Copyright (c) 1986, 1989-2001 Massachusetts Institute of Technology
 ;;;
@@ -92,35 +92,35 @@ The following commands evaluate Scheme expressions:
 
 ;;;; Read Syntax
 
-(define scheme-mode:syntax-table (make-syntax-table))
+(define scheme-mode:syntax-table (make-char-syntax-table))
 
 (modify-syntax-entries! scheme-mode:syntax-table #\nul #\/ "_")
 (modify-syntax-entries! scheme-mode:syntax-table #\: #\@ "_")
 (modify-syntax-entries! scheme-mode:syntax-table #\[ #\` "_")
 (modify-syntax-entries! scheme-mode:syntax-table #\{ #\rubout "_")
 
-(modify-syntax-entry! scheme-mode:syntax-table #\space " ")
-(modify-syntax-entry! scheme-mode:syntax-table #\tab " ")
-(modify-syntax-entry! scheme-mode:syntax-table #\page " ")
-(modify-syntax-entry! scheme-mode:syntax-table #\[ "(]")
-(modify-syntax-entry! scheme-mode:syntax-table #\] ")[")
-(modify-syntax-entry! scheme-mode:syntax-table #\{ "(}")
-(modify-syntax-entry! scheme-mode:syntax-table #\} "){")
-(modify-syntax-entry! scheme-mode:syntax-table #\| "  23")
+(set-char-syntax! scheme-mode:syntax-table #\space " ")
+(set-char-syntax! scheme-mode:syntax-table #\tab " ")
+(set-char-syntax! scheme-mode:syntax-table #\page " ")
+(set-char-syntax! scheme-mode:syntax-table #\[ "(]")
+(set-char-syntax! scheme-mode:syntax-table #\] ")[")
+(set-char-syntax! scheme-mode:syntax-table #\{ "(}")
+(set-char-syntax! scheme-mode:syntax-table #\} "){")
+(set-char-syntax! scheme-mode:syntax-table #\| "  23")
 
-(modify-syntax-entry! scheme-mode:syntax-table #\; "< ")
-(modify-syntax-entry! scheme-mode:syntax-table #\newline "> ")
+(set-char-syntax! scheme-mode:syntax-table #\; "< ")
+(set-char-syntax! scheme-mode:syntax-table #\newline "> ")
 
-(modify-syntax-entry! scheme-mode:syntax-table #\' "  p")
-(modify-syntax-entry! scheme-mode:syntax-table #\` "  p")
-(modify-syntax-entry! scheme-mode:syntax-table #\, "_ p")
-(modify-syntax-entry! scheme-mode:syntax-table #\@ "_ p")
-(modify-syntax-entry! scheme-mode:syntax-table #\# "_ p14")
+(set-char-syntax! scheme-mode:syntax-table #\' "  p")
+(set-char-syntax! scheme-mode:syntax-table #\` "  p")
+(set-char-syntax! scheme-mode:syntax-table #\, "_ p")
+(set-char-syntax! scheme-mode:syntax-table #\@ "_ p")
+(set-char-syntax! scheme-mode:syntax-table #\# "_ p14")
 
-(modify-syntax-entry! scheme-mode:syntax-table #\" "\" ")
-(modify-syntax-entry! scheme-mode:syntax-table #\\ "\\ ")
-(modify-syntax-entry! scheme-mode:syntax-table #\( "()")
-(modify-syntax-entry! scheme-mode:syntax-table #\) ")(")
+(set-char-syntax! scheme-mode:syntax-table #\" "\" ")
+(set-char-syntax! scheme-mode:syntax-table #\\ "\\ ")
+(set-char-syntax! scheme-mode:syntax-table #\( "()")
+(set-char-syntax! scheme-mode:syntax-table #\) ")(")
 
 ;;;; Indentation
 
diff --git a/v7/src/edwin/syntax.scm b/v7/src/edwin/syntax.scm
index ba4f0bac7..3846b9513 100644
--- a/v7/src/edwin/syntax.scm
+++ b/v7/src/edwin/syntax.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: syntax.scm,v 1.85 2000/02/25 14:21:11 cph Exp $
+;;; $Id: syntax.scm,v 1.86 2001/12/18 22:12:30 cph Exp $
 ;;;
-;;; Copyright (c) 1986, 1989-2000 Massachusetts Institute of Technology
+;;; Copyright (c) 1986, 1989-2001 Massachusetts Institute of Technology
 ;;;
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU General Public License as
@@ -16,13 +16,13 @@
 ;;;
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program; if not, write to the Free Software
-;;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;;; 02111-1307, USA.
 
 ;;;; Syntax Tables
 
 (declare (usual-integrations))
 
-(define make-syntax-table make-char-syntax-table)
 (define modify-syntax-entry! set-char-syntax!)
 
 (define (modify-syntax-entries! syntax-table cl ch string)
diff --git a/v7/src/edwin/texcom.scm b/v7/src/edwin/texcom.scm
index fcd645e07..bb4ac358f 100644
--- a/v7/src/edwin/texcom.scm
+++ b/v7/src/edwin/texcom.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: texcom.scm,v 1.45 2000/03/02 05:31:10 cph Exp $
+;;; $Id: texcom.scm,v 1.46 2001/12/18 22:12:32 cph Exp $
 ;;;
-;;; Copyright (c) 1986, 1989-2000 Massachusetts Institute of Technology
+;;; Copyright (c) 1986, 1989-2001 Massachusetts Institute of Technology
 ;;;
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU General Public License as
@@ -16,7 +16,8 @@
 ;;;
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program; if not, write to the Free Software
-;;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;;; 02111-1307, USA.
 
 ;;;; Text Commands
 
@@ -34,14 +35,14 @@
 
 (define-key 'text #\m-s 'center-line)
 
-(define text-mode:syntax-table (make-syntax-table))
-(modify-syntax-entry! text-mode:syntax-table #\" "    ")
-(modify-syntax-entry! text-mode:syntax-table #\\ "    ")
-(modify-syntax-entry! text-mode:syntax-table #\[ "(]  ")
-(modify-syntax-entry! text-mode:syntax-table #\] ")[  ")
-(modify-syntax-entry! text-mode:syntax-table #\{ "(}  ")
-(modify-syntax-entry! text-mode:syntax-table #\} "){  ")
-(modify-syntax-entry! text-mode:syntax-table #\' "w   ")
+(define text-mode:syntax-table (make-char-syntax-table))
+(set-char-syntax! text-mode:syntax-table #\" "    ")
+(set-char-syntax! text-mode:syntax-table #\\ "    ")
+(set-char-syntax! text-mode:syntax-table #\[ "(]  ")
+(set-char-syntax! text-mode:syntax-table #\] ")[  ")
+(set-char-syntax! text-mode:syntax-table #\{ "(}  ")
+(set-char-syntax! text-mode:syntax-table #\} "){  ")
+(set-char-syntax! text-mode:syntax-table #\' "w   ")
 
 (define-variable text-mode-abbrev-table
   "Mode-specific abbrev table for Text mode.")
diff --git a/v7/src/edwin/tximod.scm b/v7/src/edwin/tximod.scm
index 4a6df5549..12cfb2193 100644
--- a/v7/src/edwin/tximod.scm
+++ b/v7/src/edwin/tximod.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: tximod.scm,v 1.24 2000/09/06 15:15:46 cph Exp $
+;;; $Id: tximod.scm,v 1.25 2001/12/18 22:12:35 cph Exp $
 ;;;
-;;; Copyright (c) 1987-2000 Massachusetts Institute of Technology
+;;; Copyright (c) 1987-2001 Massachusetts Institute of Technology
 ;;;
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU General Public License as
@@ -16,7 +16,8 @@
 ;;;
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program; if not, write to the Free Software
-;;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;;; 02111-1307, USA.
 
 ;;;; Texinfo Mode
 
@@ -68,12 +69,12 @@ commands to save keystrokes.
     (event-distributor/invoke! (ref-variable texinfo-mode-hook buffer)
 			       buffer)))
 
-(define texinfo-mode:syntax-table (make-syntax-table))
-(modify-syntax-entry! texinfo-mode:syntax-table #\" " ")
-(modify-syntax-entry! texinfo-mode:syntax-table #\\ " ")
-(modify-syntax-entry! texinfo-mode:syntax-table #\@ "\\")
-(modify-syntax-entry! texinfo-mode:syntax-table #\DC1 "\\")
-(modify-syntax-entry! texinfo-mode:syntax-table #\' "w")
+(define texinfo-mode:syntax-table (make-char-syntax-table))
+(set-char-syntax! texinfo-mode:syntax-table #\" " ")
+(set-char-syntax! texinfo-mode:syntax-table #\\ " ")
+(set-char-syntax! texinfo-mode:syntax-table #\@ "\\")
+(set-char-syntax! texinfo-mode:syntax-table #\DC1 "\\")
+(set-char-syntax! texinfo-mode:syntax-table #\' "w")
 
 (define-key 'texinfo '(#\C-c #\{) 'texinfo-insert-braces)
 (define-key 'texinfo '(#\C-c #\}) 'up-list)
diff --git a/v7/src/edwin/verilog.scm b/v7/src/edwin/verilog.scm
index 57c9f032b..aefb8f1b9 100644
--- a/v7/src/edwin/verilog.scm
+++ b/v7/src/edwin/verilog.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: verilog.scm,v 1.8 2000/03/02 05:31:39 cph Exp $
+;;; $Id: verilog.scm,v 1.9 2001/12/18 22:12:37 cph Exp $
 ;;;
-;;; Copyright (c) 1996-2000 Massachusetts Institute of Technology
+;;; Copyright (c) 1996-2001 Massachusetts Institute of Technology
 ;;;
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU General Public License as
@@ -16,7 +16,8 @@
 ;;;
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program; if not, write to the Free Software
-;;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;;; 02111-1307, USA.
 
 ;;;; Major Mode for Verilog Programs
 
@@ -55,16 +56,16 @@
 			       buffer)))
 
 (define verilog-mode:syntax-table
-  (let ((syntax-table (make-syntax-table)))
-    (for-each (lambda (char) (modify-syntax-entry! syntax-table char "."))
+  (let ((syntax-table (make-char-syntax-table)))
+    (for-each (lambda (char) (set-char-syntax! syntax-table char "."))
 	      (string->list "+-=%<>&|"))
-    (modify-syntax-entry! syntax-table #\' "_")
-    (modify-syntax-entry! syntax-table #\` ". p")
-    (modify-syntax-entry! syntax-table #\# ". p")
-    (modify-syntax-entry! syntax-table #\@ ". p")
-    (modify-syntax-entry! syntax-table #\/ ". 1456")
-    (modify-syntax-entry! syntax-table #\* ". 23")
-    (modify-syntax-entry! syntax-table #\newline ">")
+    (set-char-syntax! syntax-table #\' "_")
+    (set-char-syntax! syntax-table #\` ". p")
+    (set-char-syntax! syntax-table #\# ". p")
+    (set-char-syntax! syntax-table #\@ ". p")
+    (set-char-syntax! syntax-table #\/ ". 1456")
+    (set-char-syntax! syntax-table #\* ". 23")
+    (set-char-syntax! syntax-table #\newline ">")
     syntax-table))
 
 (define-key 'verilog #\linefeed 'reindent-then-newline-and-indent)
diff --git a/v7/src/edwin/vhdl.scm b/v7/src/edwin/vhdl.scm
index d5d7f96c4..377aa9939 100644
--- a/v7/src/edwin/vhdl.scm
+++ b/v7/src/edwin/vhdl.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: vhdl.scm,v 1.8 2000/03/02 05:31:35 cph Exp $
+;;; $Id: vhdl.scm,v 1.9 2001/12/18 22:12:39 cph Exp $
 ;;;
-;;; Copyright (c) 1997-2000 Massachusetts Institute of Technology
+;;; Copyright (c) 1997-2001 Massachusetts Institute of Technology
 ;;;
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU General Public License as
@@ -16,7 +16,8 @@
 ;;;
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program; if not, write to the Free Software
-;;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;;; 02111-1307, USA.
 
 ;;;; Major Mode for VHDL Programs
 
@@ -54,15 +55,15 @@
 			       buffer)))
 
 (define vhdl-mode:syntax-table
-  (let ((syntax-table (make-syntax-table)))
-    (for-each (lambda (char) (modify-syntax-entry! syntax-table char "_"))
+  (let ((syntax-table (make-char-syntax-table)))
+    (for-each (lambda (char) (set-char-syntax! syntax-table char "_"))
 	      (string->list "_.#+"))
-    (for-each (lambda (char) (modify-syntax-entry! syntax-table char "."))
+    (for-each (lambda (char) (set-char-syntax! syntax-table char "."))
 	      (string->list "*/&|<>=$%"))
-    (modify-syntax-entry! syntax-table #\\ "\"")
-    (modify-syntax-entry! syntax-table #\' "\"")
-    (modify-syntax-entry! syntax-table #\- "_ 56")
-    (modify-syntax-entry! syntax-table #\newline ">")
+    (set-char-syntax! syntax-table #\\ "\"")
+    (set-char-syntax! syntax-table #\' "\"")
+    (set-char-syntax! syntax-table #\- "_ 56")
+    (set-char-syntax! syntax-table #\newline ">")
     syntax-table))
 
 (define-key 'vhdl #\linefeed 'reindent-then-newline-and-indent)
-- 
2.25.1