From: Kazuhiro Ito <kzhr@d1.dion.ne.jp>
Date: Wed, 18 Dec 2013 05:01:30 +0000 (+0800)
Subject: make-mode.el (makefile-fill-paragraph): Fix infloop.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~351
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=83c60f60bfa7a2f2c5d3e487e7e5c00732996815;p=emacs.git

make-mode.el (makefile-fill-paragraph): Fix infloop.

Fixes: debbugs:13914
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa79352e7a2..aef7eb5cc5b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-18  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny change)
+
+	* progmodes/make-mode.el (makefile-fill-paragraph): Fix infloop
+	(Bug#13914).
+
 2013-12-18  Shigeru Fukaya <shigeru.fukaya@gmail.com>
 
 	* apropos.el (apropos-words-to-regexp): Fix algorithm (Bug#13946).
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 3c0871e57b6..01d1e76457d 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1300,7 +1300,8 @@ Fill comments, backslashed lines, and variable definitions specially."
                  (point))))
 	    (end
 	     (save-excursion
-	       (while (= (preceding-char) ?\\)
+	       (while (and (= (preceding-char) ?\\)
+			   (not (eobp)))
 		 (end-of-line 2))
 	       (point))))
 	(save-restriction