Fix s{a}{b} parsing

2 files changed, 15 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4022fef04b..69d753121ea 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  Glenn Morris  <rgm@gnu.org>
 
         * progmodes/compile.el (compilation-get-file-structure): Make use
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)