1. Nic Ferrier
  2. emacs

Commits

Glenn Morris  committed 9a734f1

Small perl-mode fixes.

* lisp/progmodes/perl-mode.el (perl-electric-terminator): Doc fix.
(perl-calculate-indent): Suppress scan errors. (Bug#2205)

  • Participants
  • Parent commits 3ffc4b1
  • Branches default

Comments (0)

Files changed (2)

File lisp/ChangeLog

View file
+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

File lisp/progmodes/perl-mode.el

View file
 
 (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
 		  (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))