Minor portability fix in smerge-mode.el.

 lisp/smerge-mode.el (smerge-resolve): Use null-device rather than a
 literal "/dev/null".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f970195..aef0246 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-09  Eli Zaretskii  <eliz@gnu.org>
+
+       * smerge-mode.el (smerge-resolve): Use null-device rather than a
+       literal "/dev/null".
+
 2011-05-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/lisp.el (lisp-complete-symbol, lisp-completion-at-point):

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 3475b41..635217f 100644 (file)
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -535,7 +535,7 @@ some 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)
@@ -551,7 +551,7 @@ some 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)