diff options
| author | Dmitry Gutov | 2023-10-14 20:10:08 +0300 |
|---|---|---|
| committer | Dmitry Gutov | 2023-10-14 20:10:08 +0300 |
| commit | c0ffa8958eba358b6c8ad072912b1fcd5aa7dfa6 (patch) | |
| tree | fe571ab517f92083bcc941dac3c134f1dcf88925 | |
| parent | 717d0335d72de5696c5ac035b9877fec3132d189 (diff) | |
| download | emacs-c0ffa8958eba358b6c8ad072912b1fcd5aa7dfa6.tar.gz emacs-c0ffa8958eba358b6c8ad072912b1fcd5aa7dfa6.zip | |
(vc-default-checkin-patch): Try to be compatible with BSD 'patch'
* lisp/vc/vc.el (vc-default-checkin-patch):
Try to be compatible with BSD 'patch' (bug#66211).
| -rw-r--r-- | lisp/vc/vc.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index e4ce75107ff..95f9218dcbf 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el | |||
| @@ -1738,7 +1738,8 @@ Runs the normal hooks `vc-before-checkin-hook' and `vc-checkin-hook'." | |||
| 1738 | nil | 1738 | nil |
| 1739 | "-p1" | 1739 | "-p1" |
| 1740 | "-r" null-device | 1740 | "-r" null-device |
| 1741 | "--no-backup-if-mismatch" | 1741 | "--posix" |
| 1742 | "--remove-empty-files" | ||
| 1742 | "-i" "-")) | 1743 | "-i" "-")) |
| 1743 | (user-error "Patch failed: %s" (buffer-string)))) | 1744 | (user-error "Patch failed: %s" (buffer-string)))) |
| 1744 | (vc-call-backend backend 'checkin files comment)) | 1745 | (vc-call-backend backend 'checkin files comment)) |