From 0e39ec218892144e0660a737d2b318e842ef26c0 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 9 May 2011 18:21:54 +0300 Subject: [PATCH] Minor portability fix in smerge-mode.el. lisp/smerge-mode.el (smerge-resolve): Use null-device rather than a literal "/dev/null". --- lisp/ChangeLog | 5 +++++ lisp/smerge-mode.el | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f9701955a77..aef0246571f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-05-09 Eli Zaretskii + + * smerge-mode.el (smerge-resolve): Use null-device rather than a + literal "/dev/null". + 2011-05-09 Stefan Monnier * emacs-lisp/lisp.el (lisp-complete-symbol, lisp-completion-at-point): diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 3475b4144c1..635217fa3af 100644 --- 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)