Commit 0e39ec21 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Minor portability fix in smerge-mode.el.

 lisp/smerge-mode.el (smerge-resolve): Use null-device rather than a
 literal "/dev/null".
parent 3f254caa
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> 2011-05-09 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/lisp.el (lisp-complete-symbol, lisp-completion-at-point): * emacs-lisp/lisp.el (lisp-complete-symbol, lisp-completion-at-point):
......
...@@ -535,7 +535,7 @@ some major modes. Uses `smerge-resolve-function' to do the actual work." ...@@ -535,7 +535,7 @@ some major modes. Uses `smerge-resolve-function' to do the actual work."
(with-current-buffer buf (with-current-buffer buf
(zerop (call-process-region (zerop (call-process-region
(point-min) (point-max) "patch" t nil nil (point-min) (point-max) "patch" t nil nil
"-r" "/dev/null" "--no-backup-if-mismatch" "-r" null-device "--no-backup-if-mismatch"
"-fl" o)))) "-fl" o))))
(save-restriction (save-restriction
(narrow-to-region m0b m0e) (narrow-to-region m0b m0e)
...@@ -551,7 +551,7 @@ some major modes. Uses `smerge-resolve-function' to do the actual work." ...@@ -551,7 +551,7 @@ some major modes. Uses `smerge-resolve-function' to do the actual work."
(with-current-buffer buf (with-current-buffer buf
(zerop (call-process-region (zerop (call-process-region
(point-min) (point-max) "patch" t nil nil (point-min) (point-max) "patch" t nil nil
"-r" "/dev/null" "--no-backup-if-mismatch" "-r" null-device "--no-backup-if-mismatch"
"-fl" m)))) "-fl" m))))
(save-restriction (save-restriction
(narrow-to-region m0b m0e) (narrow-to-region m0b m0e)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment