]> git.eshelyaron.com Git - emacs.git/commitdiff
Avoid inflooping in font-lock
authorEli Zaretskii <eliz@gnu.org>
Fri, 9 Oct 2015 08:12:58 +0000 (11:12 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 9 Oct 2015 08:12:58 +0000 (11:12 +0300)
* lisp/font-lock.el (font-lock-extend-region-wholelines): Bind
inhibit-field-text-motion around the call to
line-beginning-position, to avoid inflooping.  (Bug#21615)

lisp/font-lock.el

index e2660bfab912415be75dd35d57affc4ca36973f5..21cf3aec7855902d069aa56b017ddc45c30c46c4 100644 (file)
@@ -1166,7 +1166,9 @@ Put first the functions more likely to cause a change and cheaper to compute.")
   (let ((changed nil))
     (goto-char font-lock-beg)
     (unless (bolp)
-      (setq changed t font-lock-beg (line-beginning-position)))
+      (setq changed t font-lock-beg
+            (let ((inhibit-field-text-motion t))
+              (line-beginning-position))))
     (goto-char font-lock-end)
     (unless (bolp)
       (unless (eq font-lock-end