2 files changed, 12 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index decb66eea09..75bad939583 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-05  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/perl-mode.el (perl-electric-terminator): Doc fix.
+        (perl-calculate-indent): Suppress scan errors.  (Bug#2205)
+
 2011-10-05  Leo Liu  <sdl.web@gmail.com>
 
         * subr.el (read-char-choice): Fix argument to buffer-live-p which
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 933f004bb5d..f051b49fe2a 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -633,8 +633,8 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'."
 
 (defalias 'electric-perl-terminator 'perl-electric-terminator)
 (defun perl-electric-terminator (arg)
-  "Insert character and adjust indentation.
-If at end-of-line, and not in a comment or a quote, correct the's indentation."
+  "Insert character and maybe adjust indentation.
+If at end-of-line, and not in a comment or a quote, correct the indentation."
   (interactive "P")
   (let ((insertpos (point)))
     (and (not arg)                      ; decide whether to indent
@@ -832,7 +832,11 @@ Optional argument PARSE-START should be the position of `beginning-of-defun'."
                   (save-excursion
                     (beginning-of-line)
                     (looking-at "\\s-+sub\\>"))
-                  (> indent-point (save-excursion (forward-sexp 1) (point))))
+                  (> indent-point (save-excursion
+                                    (condition-case nil
+                                        (forward-sexp 1)
+                                      (scan-error nil))
+                                    (point))))
         (perl-beginning-of-function))
       (while (< (point) indent-point)   ;repeat until right sexp
         (setq state (parse-partial-sexp (point) indent-point 0))