# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1250464821 0
# Node ID bf7a2419d30f1ae9f091dd63793df313f915f24c
# Parent  2ecd57cadf51be6c55f71e5f8b8d9c41b0602cd2
* progmodes/cperl-mode.el (cperl-electric-paren): Don't expand
abbrev (Bug#3943).

diff -r 2ecd57cadf51 -r bf7a2419d30f lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Aug 16 23:08:18 2009 +0000
+++ b/lisp/ChangeLog	Sun Aug 16 23:20:21 2009 +0000
@@ -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 -r 2ecd57cadf51 -r bf7a2419d30f lisp/progmodes/cperl-mode.el
--- a/lisp/progmodes/cperl-mode.el	Sun Aug 16 23:08:18 2009 +0000
+++ b/lisp/progmodes/cperl-mode.el	Sun Aug 16 23:20:21 2009 +0000
@@ -2154,8 +2154,9 @@
 	     ;;(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