From 0b73932e90496e0477eddce6ba7e87d2137cb730 Mon Sep 17 00:00:00 2001 From: Nathan Trapuzzano Date: Sun, 3 Nov 2013 08:44:36 -0500 Subject: [PATCH] * progmodes/cperl-mode.el (cperl-font-lock-fontify-region-function): Don't infloop when expanding region over `multiline' syntax-type that begins a line. (Bug#15778) --- lisp/ChangeLog | 7 +++++++ lisp/progmodes/cperl-mode.el | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6a91465..b047b57 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2013-11-03 Nathan Trapuzzano + + * progmodes/cperl-mode.el + (cperl-font-lock-fontify-region-function): Don't infloop when + expanding region over `multiline' syntax-type that begins a line. + (Bug#15778) + 2013-11-02 Glenn Morris * Makefile.in (EMACS): Use a relative filename. diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 8a7d1e7..36b05c8 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -8900,8 +8900,9 @@ do extra unwind via `cperl-unwind-to-safe'." (beginning-of-line) (eq (get-text-property (setq beg (point)) 'syntax-type) 'multiline))) - (if (setq beg (cperl-beginning-of-property beg 'syntax-type)) - (goto-char beg))) + (let ((new-beg (cperl-beginning-of-property beg 'syntax-type))) + (setq beg (if (= new-beg beg) nil new-beg)) + (goto-char new-beg))) (setq beg (point)) (goto-char end) (while (and end -- 1.8.4.2