diff options
| author | Kazuhiro Ito | 2013-12-18 13:01:30 +0800 |
|---|---|---|
| committer | Chong Yidong | 2013-12-18 13:01:30 +0800 |
| commit | 83c60f60bfa7a2f2c5d3e487e7e5c00732996815 (patch) | |
| tree | 73b26d056a1ee63e329c89206ea183a5d3ff8466 | |
| parent | ba874b6430893be55d48840a901aac4e64a4befc (diff) | |
| download | emacs-83c60f60bfa7a2f2c5d3e487e7e5c00732996815.tar.gz emacs-83c60f60bfa7a2f2c5d3e487e7e5c00732996815.zip | |
make-mode.el (makefile-fill-paragraph): Fix infloop.
Fixes: debbugs:13914
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/make-mode.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fa79352e7a2..aef7eb5cc5b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-12-18 Kazuhiro Ito <kzhr@d1.dion.ne.jp> (tiny change) | ||
| 2 | |||
| 3 | * progmodes/make-mode.el (makefile-fill-paragraph): Fix infloop | ||
| 4 | (Bug#13914). | ||
| 5 | |||
| 1 | 2013-12-18 Shigeru Fukaya <shigeru.fukaya@gmail.com> | 6 | 2013-12-18 Shigeru Fukaya <shigeru.fukaya@gmail.com> |
| 2 | 7 | ||
| 3 | * apropos.el (apropos-words-to-regexp): Fix algorithm (Bug#13946). | 8 | * 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." | |||
| 1300 | (point)))) | 1300 | (point)))) |
| 1301 | (end | 1301 | (end |
| 1302 | (save-excursion | 1302 | (save-excursion |
| 1303 | (while (= (preceding-char) ?\\) | 1303 | (while (and (= (preceding-char) ?\\) |
| 1304 | (not (eobp))) | ||
| 1304 | (end-of-line 2)) | 1305 | (end-of-line 2)) |
| 1305 | (point)))) | 1306 | (point)))) |
| 1306 | (save-restriction | 1307 | (save-restriction |