commit d2c7e14ac3bd2b517d35a86255c28d5b6d779451 (HEAD, refs/remotes/origin/master) Author: Eli Zaretskii Date: Sat May 9 16:06:48 2015 +0300 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 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)))))))) commit b18353c61c699d4917f8dfed95fc43b8a691b5ad Author: Glenn Morris Date: Sat May 9 06:24:38 2015 -0400 ; Auto-commit of loaddefs files. diff --git a/lisp/dired.el b/lisp/dired.el index cc16c8c..ca13900 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -3889,7 +3889,7 @@ Ask means pop up a menu for the user to select one of copy, move or link." ;;; Start of automatically extracted autoloads. -;;;### (autoloads nil "dired-aux" "dired-aux.el" "65f8aa57ace423283926d92dff903ca7") +;;;### (autoloads nil "dired-aux" "dired-aux.el" "8820677763cb69eef827e38b86d35f47") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 1572712..f0c6d87 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -4746,7 +4746,7 @@ With prefix argument N moves forward N messages with these labels. ;;;*** -;;;### (autoloads nil "rmailmm" "rmailmm.el" "a17df5ef8968113c8f6a78cf85c82da4") +;;;### (autoloads nil "rmailmm" "rmailmm.el" "e5b89eed8afb278cc8881f2208382c7c") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\