(cperl-mode): Define abbrevs even if abbrev-table is non-nil (saved

user abbrevs may have been restored).

diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 983087d07bc2b0a7c2aae38ccad10b7af682ea3f..14cbaf9c0f41873141c4ed6a8f6bc2aa66965002 100644 (file)
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1681,9 +1681,8 @@ or as help on variables `cperl-tips', `cperl-problems',
                          [(control c) (control h) f])))
   (setq major-mode cperl-use-major-mode)
   (setq mode-name "CPerl")
-  (if (not cperl-mode-abbrev-table)
-      (let ((prev-a-c abbrevs-changed))
-       (define-abbrev-table 'cperl-mode-abbrev-table '(
+  (let ((prev-a-c abbrevs-changed))
+    (define-abbrev-table 'cperl-mode-abbrev-table '(
                ("if" "if" cperl-electric-keyword 0)
                ("elsif" "elsif" cperl-electric-keyword 0)
                ("while" "while" cperl-electric-keyword 0)
@@ -1704,7 +1703,7 @@ or as help on variables `cperl-tips', `cperl-problems',
                ("over" "over" cperl-electric-pod 0)
                ("head1" "head1" cperl-electric-pod 0)
                ("head2" "head2" cperl-electric-pod 0)))
-       (setq abbrevs-changed prev-a-c)))
+       (setq abbrevs-changed prev-a-c))
   (setq local-abbrev-table cperl-mode-abbrev-table)
   (if (cperl-val 'cperl-electric-keywords)
       (abbrev-mode 1))