Mercurial > emacs
comparison lisp/ediff-ptch.el @ 89909:68c22ea6027c
Sync to HEAD
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 16 Apr 2004 12:51:06 +0000 |
| parents | 375f2633d815 |
| children | f9a65d7ebd29 |
comparison
equal
deleted
inserted
replaced
| 89908:ee1402f7b568 | 89909:68c22ea6027c |
|---|---|
| 84 :type 'string | 84 :type 'string |
| 85 :group 'ediff-ptch) | 85 :group 'ediff-ptch) |
| 86 | 86 |
| 87 (defun ediff-test-patch-utility () | 87 (defun ediff-test-patch-utility () |
| 88 (condition-case nil | 88 (condition-case nil |
| 89 (cond ((zerop (call-process ediff-patch-program nil nil nil "-z." "-b")) | 89 (cond ((eq 0 (call-process ediff-patch-program nil nil nil "-z." "-b")) |
| 90 ;; GNU `patch' v. >= 2.2 | 90 ;; GNU `patch' v. >= 2.2 |
| 91 'gnu) | 91 'gnu) |
| 92 ((zerop (call-process ediff-patch-program nil nil nil "-b")) | 92 ((eq 0 (call-process ediff-patch-program nil nil nil "-b")) |
| 93 'posix) | 93 'posix) |
| 94 (t 'traditional)) | 94 (t 'traditional)) |
| 95 (file-error nil))) | 95 (file-error nil))) |
| 96 | 96 |
| 97 (defcustom ediff-backup-specs | 97 (defcustom ediff-backup-specs |
| 800 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) | 800 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) |
| 801 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) | 801 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) |
| 802 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) | 802 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) |
| 803 ;;; End: | 803 ;;; End: |
| 804 | 804 |
| 805 ;;; arch-tag: 2fe2161e-e116-469b-90fa-5cbb44c1bd1b | |
| 805 ;;; ediff-ptch.el ends here | 806 ;;; ediff-ptch.el ends here |