* progmodes/cperl-mode.el (cperl-electric-paren): Don't expand

abbrev (Bug#3943).

2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8eabde083f7..0327630fbb2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-16  Chong Yidong  <cyd@stupidchicken.com>
+
+        * progmodes/cperl-mode.el (cperl-electric-paren): Don't expand
+        abbrev (Bug#3943).
+
 2007-10-08  Ilya Zakharevich  <ilyaz@cpan.org>
 
         * progmodes/cperl-mode.el: Merge upstream 6.2.
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index a6f322145f5..d2b3c5d3791 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -2154,8 +2154,9 @@ See `cperl-electric-parens'."
              ;;(not (save-excursion (search-backward "#" beg t)))
              (if (eq last-command-event ?<)
                  (progn
-                   (and abbrev-mode ; later it is too late, may be after `for'
-                        (expand-abbrev))
+                   ;; This code is too electric, see Bug#3943.
+                   ;; (and abbrev-mode ; later it is too late, may be after `for'
+                   ;;   (expand-abbrev))
                    (cperl-after-expr-p nil "{;(,:="))
                1))
         (progn