diff options
| author | Vinicius Jose Latorre <viniciusjl@ig.com.br> | 2007-08-17 18:57:47 +0000 |
|---|---|---|
| committer | Vinicius Jose Latorre <viniciusjl@ig.com.br> | 2007-08-17 18:57:47 +0000 |
| commit | 88a11b81fe1d29b62c4396bb0943d0cfc1cc035a (patch) | |
| tree | f46cf05feaba78a0ff6ce375b9d963efa6b90134 /lisp | |
| parent | 30cc206bf35a1b3bf76753bee1c06c390de4f1a4 (diff) | |
| download | emacs-88a11b81fe1d29b62c4396bb0943d0cfc1cc035a.tar.gz | |
Fix s{a}{b} parsing
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/progmodes/cperl-mode.el | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b169be42fb1..838aa3709f5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2007-08-17 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> (tiny change) + + * progmode/cperl-mode.el (cperl-look-at-leading-count) + (cperl-find-pods-heres): Fix an error when typing expressions like + `s{a}{b}'. + 2007-08-17 Micha,Ak(Bl Cadilhac <michael@cadilhac.name> * mail/emacsbug.el (report-emacs-bug): Remove the last number of diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index cd7dabb8825..5a91141db6c 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -3736,8 +3736,12 @@ Should be called with the point before leading colon of an attribute." (set-syntax-table reset-st)))) (defsubst cperl-look-at-leading-count (is-x-REx e) - (if (re-search-forward (concat "\\=" (if is-x-REx "[ \t\n]*" "") "[{?+*]") - (1- e) t) ; return nil on failure, no moving + (if (and (> (point) e) + ;; return nil on failure, no moving + (re-search-forward (concat "\\=" + (if is-x-REx "[ \t\n]*" "") + "[{?+*]") + (1- e) t)) (if (eq ?\{ (preceding-char)) nil (cperl-postpone-fontification (1- (point)) (point) @@ -3750,7 +3754,7 @@ If `cperl-pod-here-fontify' is not-nil after evaluation, will fontify the sections using `cperl-pod-head-face', `cperl-pod-face', `cperl-here-face'." (interactive) - (or min (setq min (point-min) + (or min (setq min (point-min) cperl-syntax-state nil cperl-syntax-done-to min)) (or max (setq max (point-max))) @@ -4785,7 +4789,8 @@ the sections using `cperl-pod-head-face', `cperl-pod-face', (progn (cperl-postpone-fontification (1- e1) e1 'face my-cperl-delimiters-face) - (if (assoc (char-after b) cperl-starters) + (if (and (not (eobp)) + (assoc (char-after b) cperl-starters)) (progn (cperl-postpone-fontification b1 (1+ b1) 'face my-cperl-delimiters-face) |