Improve previous cperl-mode change

* lisp/progmodes/cperl-mode.el (cperl-mode-abbrev-table):
Improve previous change.

1 files changed, 22 insertions, 24 deletions

diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 79c9e56ba6a..17035769cbd 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1126,7 +1126,28 @@ versions of Emacs."
   ;; expansion manually.  Any other suggestions?
   (require 'cl))
 
-(defvar cperl-mode-abbrev-table nil
+(define-abbrev-table 'cperl-mode-abbrev-table
+  '(
+    ("if" "if" cperl-electric-keyword :system t)
+    ("elsif" "elsif" cperl-electric-keyword :system t)
+    ("while" "while" cperl-electric-keyword :system t)
+    ("until" "until" cperl-electric-keyword :system t)
+    ("unless" "unless" cperl-electric-keyword :system t)
+    ("else" "else" cperl-electric-else :system t)
+    ("continue" "continue" cperl-electric-else :system t)
+    ("for" "for" cperl-electric-keyword :system t)
+    ("foreach" "foreach" cperl-electric-keyword :system t)
+    ("formy" "formy" cperl-electric-keyword :system t)
+    ("foreachmy" "foreachmy" cperl-electric-keyword :system t)
+    ("do" "do" cperl-electric-keyword :system t)
+    ("=pod" "=pod" cperl-electric-pod :system t)
+    ("=over" "=over" cperl-electric-pod :system t)
+    ("=head1" "=head1" cperl-electric-pod :system t)
+    ("=head2" "=head2" cperl-electric-pod :system t)
+    ("pod" "pod" cperl-electric-pod :system t)
+    ("over" "over" cperl-electric-pod :system t)
+    ("head1" "head1" cperl-electric-pod :system t)
+    ("head2" "head2" cperl-electric-pod :system t))
   "Abbrev table in use in CPerl mode buffers.")
 
 (add-hook 'edit-var-mode-alist '(perl-mode (regexp . "^cperl-")))
@@ -1708,29 +1729,6 @@ or as help on variables `cperl-tips', `cperl-problems',
         (cperl-define-key "\C-hf" 'cperl-info-on-current-command [(control h) f])
         (cperl-define-key "\C-c\C-hf" 'cperl-info-on-command
                           [(control c) (control h) f])))
-  (let ((prev-a-c abbrevs-changed))
-    (define-abbrev-table 'cperl-mode-abbrev-table '(
-                ("if" "if" cperl-electric-keyword :system t)
-                ("elsif" "elsif" cperl-electric-keyword :system t)
-                ("while" "while" cperl-electric-keyword :system t)
-                ("until" "until" cperl-electric-keyword :system t)
-                ("unless" "unless" cperl-electric-keyword :system t)
-                ("else" "else" cperl-electric-else :system t)
-                ("continue" "continue" cperl-electric-else :system t)
-                ("for" "for" cperl-electric-keyword :system t)
-                ("foreach" "foreach" cperl-electric-keyword :system t)
-                ("formy" "formy" cperl-electric-keyword :system t)
-                ("foreachmy" "foreachmy" cperl-electric-keyword :system t)
-                ("do" "do" cperl-electric-keyword :system t)
-                ("=pod" "=pod" cperl-electric-pod :system t)
-                ("=over" "=over" cperl-electric-pod :system t)
-                ("=head1" "=head1" cperl-electric-pod :system t)
-                ("=head2" "=head2" cperl-electric-pod :system t)
-                ("pod" "pod" cperl-electric-pod :system t)
-                ("over" "over" cperl-electric-pod :system t)
-                ("head1" "head1" cperl-electric-pod :system t)
-                ("head2" "head2" cperl-electric-pod :system t)))
-        (setq abbrevs-changed prev-a-c))
   (setq local-abbrev-table cperl-mode-abbrev-table)
   (if (cperl-val 'cperl-electric-keywords)
       (abbrev-mode 1))