Mercurial > emacs
changeset 104311:bf7a2419d30f
* progmodes/cperl-mode.el (cperl-electric-paren): Don't expand
abbrev (Bug#3943).
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sun, 16 Aug 2009 23:20:21 +0000 |
parents | 2ecd57cadf51 |
children | c8e168f901e7 |
files | lisp/ChangeLog lisp/progmodes/cperl-mode.el |
diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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