From 250dab6fa5c3c11fd533ca3d6a38ebf996632271 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 29 Feb 2000 03:59:38 +0000
Subject: [PATCH] Re-do definitions of mode-specific abbrev tables so that
 their names are properly registered.

---
 v7/src/edwin/c-mode.scm   |  9 ++++-----
 v7/src/edwin/htmlmode.scm |  7 +++----
 v7/src/edwin/javamode.scm | 12 +++++-------
 v7/src/edwin/loadef.scm   | 27 +++++++++++----------------
 v7/src/edwin/schmod.scm   |  7 +++----
 v7/src/edwin/shell.scm    |  7 +++----
 v7/src/edwin/texcom.scm   |  7 +++----
 7 files changed, 32 insertions(+), 44 deletions(-)

diff --git a/v7/src/edwin/c-mode.scm b/v7/src/edwin/c-mode.scm
index 30fdcf68b..c1dce0ce6 100644
--- a/v7/src/edwin/c-mode.scm
+++ b/v7/src/edwin/c-mode.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: c-mode.scm,v 1.57 2000/02/29 02:41:14 cph Exp $
+;;; $Id: c-mode.scm,v 1.58 2000/02/29 03:59:38 cph Exp $
 ;;;
 ;;; Copyright (c) 1986, 1989-2000 Massachusetts Institute of Technology
 ;;;
@@ -91,10 +91,9 @@ Settings for K&R and BSD indentation styles are
   ()
   (lambda () (set-current-major-mode! (ref-mode-object c))))
 
-(define-variable C-mode-abbrev-table
-  "Mode-specific abbrev table for C code."
-  (make-abbrev-table)
-  abbrev-table?)
+(define-variable c-mode-abbrev-table
+  "Mode-specific abbrev table for C code.")
+(define-abbrev-table 'c-mode-abbrev-table '())
 
 (define-variable c-mode-hook
   "An event distributor that is invoked when entering C mode."
diff --git a/v7/src/edwin/htmlmode.scm b/v7/src/edwin/htmlmode.scm
index c37b2952a..f9a4f2772 100644
--- a/v7/src/edwin/htmlmode.scm
+++ b/v7/src/edwin/htmlmode.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: htmlmode.scm,v 1.2 2000/02/29 02:41:11 cph Exp $
+;;; $Id: htmlmode.scm,v 1.3 2000/02/29 03:59:35 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -56,9 +56,8 @@
   (lambda () (set-current-major-mode! (ref-mode-object html))))
 
 (define-variable html-mode-abbrev-table
-  "Mode-specific abbrev table for HTML."
-  (make-abbrev-table)
-  abbrev-table?)
+  "Mode-specific abbrev table for HTML.")
+(define-abbrev-table 'html-mode-abbrev-table '())
 
 (define-variable html-mode-hook
   "An event distributor that is invoked when entering HTML mode."
diff --git a/v7/src/edwin/javamode.scm b/v7/src/edwin/javamode.scm
index 88d3f9411..8301b54a1 100644
--- a/v7/src/edwin/javamode.scm
+++ b/v7/src/edwin/javamode.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: javamode.scm,v 1.9 2000/02/29 02:41:07 cph Exp $
+;;; $Id: javamode.scm,v 1.10 2000/02/29 03:59:31 cph Exp $
 ;;;
 ;;; Copyright (c) 1998-2000 Massachusetts Institute of Technology
 ;;;
@@ -57,9 +57,8 @@ This is just like C mode, except that
   (lambda () (set-current-major-mode! (ref-mode-object java))))
 
 (define-variable java-mode-abbrev-table
-  "Mode-specific abbrev table for Java code."
-  (make-abbrev-table)
-  abbrev-table?)
+  "Mode-specific abbrev table for Java code.")
+(define-abbrev-table 'java-mode-abbrev-table '())
 
 (define-variable java-mode-hook
   "An event distributor that is invoked when entering Java mode."
@@ -117,9 +116,8 @@ This is just like C mode, except that
   (lambda () (set-current-major-mode! (ref-mode-object php))))
 
 (define-variable php-mode-abbrev-table
-  "Mode-specific abbrev table for PHP code."
-  (make-abbrev-table)
-  abbrev-table?)
+  "Mode-specific abbrev table for PHP code.")
+(define-abbrev-table 'php-mode-abbrev-table '())
 
 (define-variable php-mode-hook
   "An event distributor that is invoked when entering PHP mode."
diff --git a/v7/src/edwin/loadef.scm b/v7/src/edwin/loadef.scm
index 142150697..6cd323d50 100644
--- a/v7/src/edwin/loadef.scm
+++ b/v7/src/edwin/loadef.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: loadef.scm,v 1.41 2000/02/29 02:47:15 cph Exp $
+;;; $Id: loadef.scm,v 1.42 2000/02/29 03:59:26 cph Exp $
 ;;;
 ;;; Copyright (c) 1986, 1989-2000 Massachusetts Institute of Technology
 ;;;
@@ -55,9 +55,8 @@
   "Enter Midas mode.")
 
 (define-variable midas-mode-abbrev-table
-  "Mode-specific abbrev table for assembly code."
-  (make-abbrev-table)
-  abbrev-table?)
+  "Mode-specific abbrev table for assembly code.")
+(define-abbrev-table 'midas-mode-abbrev-table '())
 
 (define-variable midas-mode-hook
   "An event distributor that is invoked when entering Midas mode."
@@ -73,9 +72,8 @@
   "Enter Pascal mode.")
 
 (define-variable pascal-mode-abbrev-table
-  "Mode-specific abbrev table for Pascal code."
-  (make-abbrev-table)
-  abbrev-table?)
+  "Mode-specific abbrev table for Pascal code.")
+(define-abbrev-table 'pascal-mode-abbrev-table '())
 
 (define-variable pascal-mode-hook
   "An event distributor that is invoked when entering Pascal mode."
@@ -112,9 +110,8 @@ commands to save keystrokes.")
   "Make the current mode be Texinfo mode.")
 
 (define-variable texinfo-mode-abbrev-table
-  "Mode-specific abbrev table for Texinfo."
-  (make-abbrev-table)
-  abbrev-table?)
+  "Mode-specific abbrev table for Texinfo.")
+(define-abbrev-table 'texinfo-mode-abbrev-table '())
 
 (define-variable texinfo-mode-hook
   "An event distributor that is invoked when entering Texinfo mode."
@@ -242,9 +239,8 @@ is open the that server, its buffer is selected.")
   "Enter Verilog mode.")
 
 (define-variable verilog-mode-abbrev-table
-  "Mode-specific abbrev table for Verilog code."
-  (make-abbrev-table)
-  abbrev-table?)
+  "Mode-specific abbrev table for Verilog code.")
+(define-abbrev-table 'verilog-mode-abbrev-table '())
 
 (define-variable verilog-mode-hook
   "An event distributor that is invoked when entering Verilog mode."
@@ -270,9 +266,8 @@ is open the that server, its buffer is selected.")
   "Enter VHDL mode.")
 
 (define-variable vhdl-mode-abbrev-table
-  "Mode-specific abbrev table for VHDL code."
-  (make-abbrev-table)
-  abbrev-table?)
+  "Mode-specific abbrev table for VHDL code.")
+(define-abbrev-table 'vhdl-mode-abbrev-table '())
 
 (define-variable vhdl-mode-hook
   "An event distributor that is invoked when entering VHDL mode."
diff --git a/v7/src/edwin/schmod.scm b/v7/src/edwin/schmod.scm
index a7eec822c..d4e0013d9 100644
--- a/v7/src/edwin/schmod.scm
+++ b/v7/src/edwin/schmod.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: schmod.scm,v 1.45 2000/02/29 02:41:02 cph Exp $
+;;; $Id: schmod.scm,v 1.46 2000/02/29 03:59:20 cph Exp $
 ;;;
 ;;; Copyright (c) 1986, 1989-2000 Massachusetts Institute of Technology
 ;;;
@@ -71,9 +71,8 @@ The following commands evaluate Scheme expressions:
     (event-distributor/invoke! (ref-variable scheme-mode-hook buffer) buffer)))
 
 (define-variable scheme-mode-abbrev-table
-  "Mode-specific abbrev table for Scheme code."
-  (make-abbrev-table)
-  abbrev-table?)
+  "Mode-specific abbrev table for Scheme code.")
+(define-abbrev-table 'scheme-mode-abbrev-table '())
 
 (define-variable scheme-mode-hook
   "An event distributor that is invoked when entering Scheme mode."
diff --git a/v7/src/edwin/shell.scm b/v7/src/edwin/shell.scm
index 5dd375d94..7bbe447e0 100644
--- a/v7/src/edwin/shell.scm
+++ b/v7/src/edwin/shell.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: shell.scm,v 1.23 2000/02/29 02:41:36 cph Exp $
+$Id: shell.scm,v 1.24 2000/02/29 03:59:17 cph Exp $
 
 Copyright (c) 1991-2000 Massachusetts Institute of Technology
 
@@ -73,9 +73,8 @@ to match their respective commands."
     (event-distributor/invoke! (ref-variable shell-mode-hook buffer) buffer)))
 
 (define-variable shell-mode-abbrev-table
-  "Mode-specific abbrev table for Shell mode."
-  (make-abbrev-table)
-  abbrev-table?)
+  "Mode-specific abbrev table for Shell mode.")
+(define-abbrev-table 'shell-mode-abbrev-table '())
 
 (define-variable shell-mode-hook
   "An event distributor that is invoked when entering Shell mode."
diff --git a/v7/src/edwin/texcom.scm b/v7/src/edwin/texcom.scm
index ca0852ae3..58c869f6c 100644
--- a/v7/src/edwin/texcom.scm
+++ b/v7/src/edwin/texcom.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: texcom.scm,v 1.43 2000/02/29 02:56:12 cph Exp $
+;;; $Id: texcom.scm,v 1.44 2000/02/29 03:59:11 cph Exp $
 ;;;
 ;;; Copyright (c) 1986, 1989-2000 Massachusetts Institute of Technology
 ;;;
@@ -43,9 +43,8 @@
 (modify-syntax-entry! text-mode:syntax-table #\' "w   ")
 
 (define-variable text-mode-abbrev-table
-  "Mode-specific abbrev table for Text mode."
-  (make-abbrev-table)
-  abbrev-table?)
+  "Mode-specific abbrev table for Text mode.")
+(define-abbrev-table 'text-mode-abbrev-table '())
 
 (define-variable text-mode-hook
   "An event distributor that is invoked when entering Text mode."
-- 
2.25.1