Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.

[gnu-emacs] / lisp / vc / smerge-mode.el

diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 75e3b514531a8cff30bac5c80dba66ff75808c83..f26ccdbedda3c7dc7e11b5899ecc4b283c0b06b8 100644 (file)
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -566,7 +566,7 @@ major modes.  Uses `smerge-resolve-function' to do the actual work."
              (with-current-buffer buf
                (zerop (call-process-region
                        (point-min) (point-max) "patch" t nil nil
-                       "-r" "/dev/null" "--no-backup-if-mismatch"
+                       "-r" null-device "--no-backup-if-mismatch"
                        "-fl" o))))
            (save-restriction
              (narrow-to-region m0b m0e)
@@ -582,7 +582,7 @@ major modes.  Uses `smerge-resolve-function' to do the actual work."
              (with-current-buffer buf
                (zerop (call-process-region
                        (point-min) (point-max) "patch" t nil nil
-                       "-r" "/dev/null" "--no-backup-if-mismatch"
+                       "-r" null-device "--no-backup-if-mismatch"
                        "-fl" m))))
            (save-restriction
              (narrow-to-region m0b m0e)