# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1282382378 -7200
# Node ID 48114bfd2ed3aa3243470666d4f90f3af2b65e4e
# Parent  252e1eb2e9447874964832189f27dbe7b928ecdb
* progmodes/make-mode.el (makefile-fill-paragraph): Account for the
extra backslash added to each line.

diff -r 252e1eb2e944 -r 48114bfd2ed3 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Aug 21 10:56:54 2010 +0200
+++ b/lisp/ChangeLog	Sat Aug 21 11:19:38 2010 +0200
@@ -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 -r 252e1eb2e944 -r 48114bfd2ed3 lisp/progmodes/make-mode.el
--- a/lisp/progmodes/make-mode.el	Sat Aug 21 10:56:54 2010 +0200
+++ b/lisp/progmodes/make-mode.el	Sat Aug 21 11:19:38 2010 +0200
@@ -1324,7 +1324,9 @@
 	(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 @@
       ;; 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.