diff options
| -rw-r--r-- | lisp/ChangeLog | 25 | ||||
| -rw-r--r-- | lisp/progmodes/make-mode.el | 6 |
2 files changed, 21 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 356fe37fb70..f0409c69ce1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-01-30 Stefan Monnier <monnier@iro.umontreal.ca> + + * progmodes/make-mode.el (makefile-fill-paragraph): Reset syntax-table + properties (bug#13179). + 2013-01-30 Glenn Morris <rgm@gnu.org> * mouse.el (mouse-drag-line): Avoid pushing same event onto @@ -17,8 +22,8 @@ 2013-01-28 Fabián Ezequiel Gallina <fgallina@cuca> - * progmodes/python.el (python-shell-parse-command): Find - python-shell-interpreter with modified environment. + * progmodes/python.el (python-shell-parse-command): + Find python-shell-interpreter with modified environment. 2013-01-26 Stefan Monnier <monnier@iro.umontreal.ca> @@ -75,8 +80,8 @@ 2013-01-10 Fabián Ezequiel Gallina <fgallina@cuca> - * progmodes/python.el (python-nav-end-of-statement): Fix - cornercase when handling multiline strings. + * progmodes/python.el (python-nav-end-of-statement): + Fix cornercase when handling multiline strings. 2013-01-10 Glenn Morris <rgm@gnu.org> @@ -220,8 +225,8 @@ 2012-12-29 Mark Lillibridge <mark.lillibridge@hp.com> - * mail/rmailmm.el (rmail-insert-mime-forwarded-message): Insert - the undecoded text of the message being forwarded. (Bug#9521) + * mail/rmailmm.el (rmail-insert-mime-forwarded-message): + Insert the undecoded text of the message being forwarded. (Bug#9521) 2012-12-28 Michael Albinus <michael.albinus@gmx.de> @@ -231,8 +236,8 @@ 2012-12-26 Dmitry Gutov <dgutov@yandex.ru> * progmodes/ruby-mode.el (ruby-indent-beg-re): Only allow "class", - "module" and "def" to have indentation before them. Regression - from 109911 (see the new test). + "module" and "def" to have indentation before them. + Regression from 109911 (see the new test). 2012-12-24 Dmitry Gutov <dgutov@yandex.ru> @@ -274,8 +279,8 @@ 2012-12-07 Eli Zaretskii <eliz@gnu.org> - * textmodes/texinfo.el (texinfo-enable-quote-envs): Add - "smallexample". + * textmodes/texinfo.el (texinfo-enable-quote-envs): + Add "smallexample". 2012-12-07 Le Wang <l26wang@gmail.com> diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index 9939a54fe41..478eb592a22 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -1307,6 +1307,12 @@ definition and conveniently use this command." (save-restriction (narrow-to-region beginning end) (makefile-backslash-region (point-min) (point-max) t) + ;; Backslashed newlines are marked as puncutations, so when + ;; fill-delete-newlines turns the LF into SPC, we end up with spaces + ;; which back-to-indentation (called via fill-newline -> + ;; fill-indent-to-left-margin -> indent-line-to) thinks are real code + ;; (bug#13179). + (remove-text-properties (point-min) (point-max) '(syntax-table)) (let ((fill-paragraph-function nil) ;; Adjust fill-column to allow space for the backslash. (fill-column (- fill-column 1))) |