Merge changes from emacs-23 branch.

2 files changed, 8 insertions, 3 deletions

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 2a198215536..712af6fd288 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1152,7 +1152,8 @@ For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'."
           (when dir
             (let ((default-directory dir))
               (flymake-log 3 "starting process on dir %s" default-directory)))
-          (setq process (apply 'start-process "flymake-proc" (current-buffer) cmd args))
+          (setq process (apply 'start-file-process
+                               "flymake-proc" (current-buffer) cmd args))
           (set-process-sentinel process 'flymake-process-sentinel)
           (set-process-filter process 'flymake-process-filter)
           (push process flymake-processes)
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 15664c8e56d..362a1db6c10 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1300,7 +1300,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))
@@ -1314,7 +1316,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.