* progmodes/make-mode.el (makefile-fill-paragraph): Account for the

extra backslash added to each line.

Fixes: debbugs:6890

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2403ab0491ccd5011c5f673debceb9f2b9b897d1..f6aa59c2db5693b12d9059915576106ae122ebf0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-21  Kirk Kelsey  <kirk.kelsey@0x4b.net>  (tiny change)
+            Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/make-mode.el (makefile-fill-paragraph): Account for the
+       extra backslash added to each line (bug#6890).
+
 2010-08-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * subr.el (read-key): Don't echo keystrokes (bug#6883).

diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 594462d5125571021ab05463e8fcad5fe8d29671..d45ecd47907cdfd0105b65445f0590b04835aa36 100644 (file)
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1324,7 +1324,9 @@ definition and conveniently use this command."
        (save-restriction
          (narrow-to-region beginning end)
          (makefile-backslash-region (point-min) (point-max) t)
-         (let ((fill-paragraph-function nil))
+         (let ((fill-paragraph-function nil)
+                ;; Adjust fill-column to allow space for the backslash.
+                (fill-column (- fill-column 1)))
            (fill-paragraph nil))
          (makefile-backslash-region (point-min) (point-max) nil)
          (goto-char (point-max))
@@ -1338,7 +1340,9 @@ definition and conveniently use this command."
       ;; resulting region.
       (save-restriction
        (narrow-to-region (point) (line-beginning-position 2))
-       (let ((fill-paragraph-function nil))
+       (let ((fill-paragraph-function nil)
+              ;; Adjust fill-column to allow space for the backslash.
+              (fill-column (- fill-column 1)))
          (fill-paragraph nil))
        (makefile-backslash-region (point-min) (point-max) nil))
       ;; Return non-nil to indicate it's been filled.