Mercurial > emacs
changeset 74429:79a5ffc89507
(cperl-mode): Define abbrevs even if abbrev-table is non-nil (saved
user abbrevs may have been restored).
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 05 Dec 2006 05:23:55 +0000 |
| parents | b401fcc1d9c0 |
| children | 1ca429066367 |
| files | lisp/progmodes/cperl-mode.el |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/progmodes/cperl-mode.el Tue Dec 05 04:07:34 2006 +0000 +++ b/lisp/progmodes/cperl-mode.el Tue Dec 05 05:23:55 2006 +0000 @@ -1681,9 +1681,8 @@ [(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 @@ ("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))