[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111209: * lisp/progmodes/make-mode.el (makefile-fill-paragraph): Reset syntax-table

[Stefan Monnier]

------------------------------------------------------------
revno: 111209
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13179
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Wed 2013-01-30 15:43:02 -0500
message:
  * lisp/progmodes/make-mode.el (makefile-fill-paragraph): Reset syntax-table
  properties.
modified:
  lisp/ChangeLog
  lisp/progmodes/make-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-30 17:14:24 +0000
+++ b/lisp/ChangeLog    2013-01-30 20:43:02 +0000
@@ -1,3 +1,8 @@
+2013-01-30  Stefan Monnier  <address@hidden>
+
+       * progmodes/make-mode.el (makefile-fill-paragraph): Reset syntax-table
+       properties (bug#13179).
+
 2013-01-30  Glenn Morris  <address@hidden>
 
        * mouse.el (mouse-drag-line): Avoid pushing same event onto
@@ -17,8 +22,8 @@
 
 2013-01-28  Fabián Ezequiel Gallina  <address@hidden>
 
-       * 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  <address@hidden>
 
@@ -75,8 +80,8 @@
 
 2013-01-10  Fabián Ezequiel Gallina  <address@hidden>
 
-       * 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  <address@hidden>
 
@@ -220,8 +225,8 @@
 
 2012-12-29  Mark Lillibridge  <address@hidden>
 
-       * 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  <address@hidden>
 
@@ -231,8 +236,8 @@
 2012-12-26  Dmitry Gutov  <address@hidden>
 
        * 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  <address@hidden>
 
@@ -274,8 +279,8 @@
 
 2012-12-07  Eli Zaretskii  <address@hidden>
 
-       * textmodes/texinfo.el (texinfo-enable-quote-envs): Add
-       "smallexample".
+       * textmodes/texinfo.el (texinfo-enable-quote-envs):
+       Add "smallexample".
 
 2012-12-07  Le Wang  <address@hidden>
 

=== modified file 'lisp/progmodes/make-mode.el'
--- a/lisp/progmodes/make-mode.el       2013-01-01 09:11:05 +0000
+++ b/lisp/progmodes/make-mode.el       2013-01-30 20:43:02 +0000
@@ -1307,6 +1307,12 @@
        (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)))