[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99995: * progmodes/make-mode.el (makefile-fill-paragraph): Account for the

[Stefan Monnier]

------------------------------------------------------------
revno: 99995
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-08-21 11:19:38 +0200
message:
  * progmodes/make-mode.el (makefile-fill-paragraph): Account for the
  extra backslash added to each line.
modified:
  lisp/ChangeLog
  lisp/progmodes/make-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-08-21 08:56:54 +0000
+++ b/lisp/ChangeLog    2010-08-21 09:19:38 +0000
@@ -1,3 +1,9 @@
+2010-08-21  Kirk Kelsey  <address@hidden>  (tiny change)
+            Stefan Monnier  <address@hidden>
+
+       * progmodes/make-mode.el (makefile-fill-paragraph): Account for the
+       extra backslash added to each line (bug#6890).
+
 2010-08-21  Stefan Monnier  <address@hidden>
 
        * subr.el (read-key): Don't echo keystrokes (bug#6883).

=== modified file 'lisp/progmodes/make-mode.el'
--- a/lisp/progmodes/make-mode.el       2010-03-24 15:57:16 +0000
+++ b/lisp/progmodes/make-mode.el       2010-08-21 09:19:38 +0000
@@ -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.