Commit 8943cfb0 authored by Glenn Morris's avatar Glenn Morris
Browse files

Small perl-mode fixes.

* lisp/progmodes/perl-mode.el (perl-electric-terminator): Doc fix.
(perl-calculate-indent): Suppress scan errors.  (Bug#2205)
parent 647ab967
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
......
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment