[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master d2c7e14: Avoid infloop in ERC
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master d2c7e14: Avoid infloop in ERC |
Date: |
Sat, 09 May 2015 13:07:13 +0000 |
branch: master
commit d2c7e14ac3bd2b517d35a86255c28d5b6d779451
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Avoid infloop in ERC
* lisp/simple.el (line-move-to-column): Ignore field boundaries
while computing line beginning position. (Bug#20498)
---
lisp/simple.el | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/lisp/simple.el b/lisp/simple.el
index 47c9cd3..dfd92dc 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))))))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master d2c7e14: Avoid infloop in ERC,
Eli Zaretskii <=