comparison lisp/progmodes/cperl-mode.el @ 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 e667f4aad5f2
comparison
equal deleted inserted replaced
104310:2ecd57cadf51 104311:bf7a2419d30f
2152 (append cperl-electric-parens-string nil)) 2152 (append cperl-electric-parens-string nil))
2153 (>= (save-excursion (cperl-to-comment-or-eol) (point)) (point)) 2153 (>= (save-excursion (cperl-to-comment-or-eol) (point)) (point))
2154 ;;(not (save-excursion (search-backward "#" beg t))) 2154 ;;(not (save-excursion (search-backward "#" beg t)))
2155 (if (eq last-command-event ?<) 2155 (if (eq last-command-event ?<)
2156 (progn 2156 (progn
2157 (and abbrev-mode ; later it is too late, may be after `for' 2157 ;; This code is too electric, see Bug#3943.
2158 (expand-abbrev)) 2158 ;; (and abbrev-mode ; later it is too late, may be after `for'
2159 ;; (expand-abbrev))
2159 (cperl-after-expr-p nil "{;(,:=")) 2160 (cperl-after-expr-p nil "{;(,:="))
2160 1)) 2161 1))
2161 (progn 2162 (progn
2162 (self-insert-command (prefix-numeric-value arg)) 2163 (self-insert-command (prefix-numeric-value arg))
2163 (if other-end (goto-char (marker-position other-end))) 2164 (if other-end (goto-char (marker-position other-end)))