[Emacs-diffs] emacs/lisp ChangeLog progmodes/cperl-mode.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/08/16 23:20:25

Modified files:
        lisp           : ChangeLog 
        lisp/progmodes : cperl-mode.el 

Log message:
        * progmodes/cperl-mode.el (cperl-electric-paren): Don't expand
        abbrev (Bug#3943).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15952&r2=1.15953
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/cperl-mode.el?cvsroot=emacs&r1=1.113&r2=1.114

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15952
retrieving revision 1.15953
diff -u -b -r1.15952 -r1.15953
--- ChangeLog   16 Aug 2009 23:08:18 -0000      1.15952
+++ ChangeLog   16 Aug 2009 23:20:21 -0000      1.15953
@@ -1,3 +1,8 @@
+2009-08-16  Chong Yidong  <address@hidden>
+
+       * progmodes/cperl-mode.el (cperl-electric-paren): Don't expand
+       abbrev (Bug#3943).
+
 2007-10-08  Ilya Zakharevich  <address@hidden>
 
        * progmodes/cperl-mode.el: Merge upstream 6.2.

Index: progmodes/cperl-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/cperl-mode.el,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- progmodes/cperl-mode.el     16 Aug 2009 23:08:21 -0000      1.113
+++ progmodes/cperl-mode.el     16 Aug 2009 23:20:24 -0000      1.114
@@ -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