diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-05-12 00:07:06 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-05-12 00:07:06 -0700 |
| commit | d2fc7e3d0f6f57f962cbd94df3bf4fd15a37bb68 (patch) | |
| tree | e6d877c35b4396bd5092a7be244b1527374d4a0e /lisp/vc/smerge-mode.el | |
| parent | d45885f7e0025fb5bd0756ba78c511a981d64533 (diff) | |
| parent | e531bdfff1ee57a0ba4af6c8575ed7856e4c86d2 (diff) | |
| download | emacs-d2fc7e3d0f6f57f962cbd94df3bf4fd15a37bb68.tar.gz | |
Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.
Diffstat (limited to 'lisp/vc/smerge-mode.el')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 75e3b514531..f26ccdbedda 100644 --- 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) |