(f90-mode-abbrev-table): Initialize in the defvar.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 07e4bd2997367ea7b3244c29565152487abbc5cd..0d3db06d6b5bf549df44837b6b6ea102cc62016c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -7,7 +7,8 @@
        (f90-font-lock-4): Move the doc strings.
        (f90-menu-bar-menu): New internal variable to hold the top-level menu.
        (f90-change-case-menu, f90-font-lock-menu): Minor code changes.
-       (f90-mode-abbrev-table): Initialize with define-abbrev-table.
+       (f90-mode-abbrev-table): Initialize in the defvar, with
+       define-abbrev-table. 
 
 2002-05-18  Eli Zaretskii  <eliz@is.elta.co.il>
 

diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 5e52c9ad3179022f2477bbe1c705efc2659eb600..2c56284ae639e4acaffc0e46b487ff2353b637d7 100644 (file)
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -689,64 +689,64 @@ do\\([ \t]*while\\)?\\|select[ \t]*case\\|where\\|forall\\)\\)\\>"
 
 \f
 ;; Abbrevs have generally two letters, except standard types `c, `i, `r, `t.
-(defvar f90-mode-abbrev-table nil "Abbrev table for F90 mode.")
-(if (not f90-mode-abbrev-table)
-    (let (abbrevs-changed)
-      (define-abbrev-table 'f90-mode-abbrev-table 
-        '(("`al"  "allocate"      nil 0 t)
-          ("`ab"  "allocatable"   nil 0 t)
-          ("`as"  "assignment"    nil 0 t)
-          ("`ba"  "backspace"     nil 0 t)
-          ("`bd"  "block data"    nil 0 t)
-          ("`c"   "character"     nil 0 t)
-          ("`cl"  "close"         nil 0 t)
-          ("`cm"  "common"        nil 0 t)
-          ("`cx"  "complex"       nil 0 t)
-          ("`cn"  "contains"      nil 0 t)
-          ("`cy"  "cycle"         nil 0 t)
-          ("`de"  "deallocate"    nil 0 t)
-          ("`df"  "define"        nil 0 t)
-          ("`di"  "dimension"     nil 0 t)
-          ("`dw"  "do while"      nil 0 t)
-          ("`el"  "else"          nil 0 t)
-          ("`eli" "else if"       nil 0 t)
-          ("`elw" "elsewhere"     nil 0 t)
-          ("`eq"  "equivalence"   nil 0 t)
-          ("`ex"  "external"      nil 0 t)
-          ("`ey"  "entry"         nil 0 t)
-          ("`fl"  "forall"        nil 0 t)
-          ("`fo"  "format"        nil 0 t)
-          ("`fu"  "function"      nil 0 t)
-          ("`fa"  ".false."       nil 0 t)
-          ("`im"  "implicit none" nil 0 t)
-          ("`in " "include"       nil 0 t)
-          ("`i"   "integer"       nil 0 t)
-          ("`it"  "intent"        nil 0 t)
-          ("`if"  "interface"     nil 0 t)
-          ("`lo"  "logical"       nil 0 t)
-          ("`mo"  "module"        nil 0 t)
-          ("`na"  "namelist"      nil 0 t)
-          ("`nu"  "nullify"       nil 0 t)
-          ("`op"  "optional"      nil 0 t)
-          ("`pa"  "parameter"     nil 0 t)
-          ("`po"  "pointer"       nil 0 t)
-          ("`pr"  "print"         nil 0 t)
-          ("`pi"  "private"       nil 0 t)
-          ("`pm"  "program"       nil 0 t)
-          ("`pu"  "public"        nil 0 t)
-          ("`r"   "real"          nil 0 t)
-          ("`rc"  "recursive"     nil 0 t)
-          ("`rt"  "return"        nil 0 t)
-          ("`rw"  "rewind"        nil 0 t)
-          ("`se"  "select"        nil 0 t)
-          ("`sq"  "sequence"      nil 0 t)
-          ("`su"  "subroutine"    nil 0 t)
-          ("`ta"  "target"        nil 0 t)
-          ("`tr"  ".true."        nil 0 t)
-          ("`t"   "type"          nil 0 t)
-          ("`wh"  "where"         nil 0 t)
-          ("`wr"  "write"         nil 0 t)))))
-
+(defvar f90-mode-abbrev-table
+  (let (abbrevs-changed)
+    (define-abbrev-table 'f90-mode-abbrev-table 
+      '(("`al"  "allocate"      nil 0 t)
+        ("`ab"  "allocatable"   nil 0 t)
+        ("`as"  "assignment"    nil 0 t)
+        ("`ba"  "backspace"     nil 0 t)
+        ("`bd"  "block data"    nil 0 t)
+        ("`c"   "character"     nil 0 t)
+        ("`cl"  "close"         nil 0 t)
+        ("`cm"  "common"        nil 0 t)
+        ("`cx"  "complex"       nil 0 t)
+        ("`cn"  "contains"      nil 0 t)
+        ("`cy"  "cycle"         nil 0 t)
+        ("`de"  "deallocate"    nil 0 t)
+        ("`df"  "define"        nil 0 t)
+        ("`di"  "dimension"     nil 0 t)
+        ("`dw"  "do while"      nil 0 t)
+        ("`el"  "else"          nil 0 t)
+        ("`eli" "else if"       nil 0 t)
+        ("`elw" "elsewhere"     nil 0 t)
+        ("`eq"  "equivalence"   nil 0 t)
+        ("`ex"  "external"      nil 0 t)
+        ("`ey"  "entry"         nil 0 t)
+        ("`fl"  "forall"        nil 0 t)
+        ("`fo"  "format"        nil 0 t)
+        ("`fu"  "function"      nil 0 t)
+        ("`fa"  ".false."       nil 0 t)
+        ("`im"  "implicit none" nil 0 t)
+        ("`in " "include"       nil 0 t)
+        ("`i"   "integer"       nil 0 t)
+        ("`it"  "intent"        nil 0 t)
+        ("`if"  "interface"     nil 0 t)
+        ("`lo"  "logical"       nil 0 t)
+        ("`mo"  "module"        nil 0 t)
+        ("`na"  "namelist"      nil 0 t)
+        ("`nu"  "nullify"       nil 0 t)
+        ("`op"  "optional"      nil 0 t)
+        ("`pa"  "parameter"     nil 0 t)
+        ("`po"  "pointer"       nil 0 t)
+        ("`pr"  "print"         nil 0 t)
+        ("`pi"  "private"       nil 0 t)
+        ("`pm"  "program"       nil 0 t)
+        ("`pu"  "public"        nil 0 t)
+        ("`r"   "real"          nil 0 t)
+        ("`rc"  "recursive"     nil 0 t)
+        ("`rt"  "return"        nil 0 t)
+        ("`rw"  "rewind"        nil 0 t)
+        ("`se"  "select"        nil 0 t)
+        ("`sq"  "sequence"      nil 0 t)
+        ("`su"  "subroutine"    nil 0 t)
+        ("`ta"  "target"        nil 0 t)
+        ("`tr"  ".true."        nil 0 t)
+        ("`t"   "type"          nil 0 t)
+        ("`wh"  "where"         nil 0 t)
+        ("`wr"  "write"         nil 0 t)))
+    f90-mode-abbrev-table)
+  "Abbrev table for F90 mode.")
 \f
 (defcustom f90-mode-hook nil
   "Hook run when entering F90 mode."