From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 9 May 2015 13:06:48 +0000 (+0300)
Subject: Avoid infloop in ERC
X-Git-Tag: emacs-25.0.90~2137
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/d2c7e14ac3bd2b517d35a86255c28d5b6d779451

Avoid infloop in ERC

* lisp/simple.el (line-move-to-column): Ignore field boundaries
while computing line beginning position.  (Bug#20498)
---

diff --git a/lisp/simple.el b/lisp/simple.el
index 47c9cd30c1..dfd92dcdc0 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -6000,7 +6000,11 @@ and `current-column' to be able to ignore invisible text."
 	;; that will get us to the same place on the screen
 	;; but with a more reasonable buffer position.
 	(goto-char normal-location)
-	(let ((line-beg (line-beginning-position)))
+	(let ((line-beg
+               ;; We want the real line beginning, so it's consistent
+               ;; with bolp below, otherwise we might infloop.
+               (let ((inhibit-field-text-motion t))
+                 (line-beginning-position))))
 	  (while (and (not (bolp)) (invisible-p (1- (point))))
 	    (goto-char (previous-char-property-change (point) line-beg))))))))