Mercurial > emacs
comparison lisp/ediff-diff.el @ 89909:68c22ea6027c
Sync to HEAD
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 16 Apr 2004 12:51:06 +0000 |
| parents | 375f2633d815 |
| children | bf0d492ea2d5 |
comparison
equal
deleted
inserted
replaced
| 89908:ee1402f7b568 | 89909:68c22ea6027c |
|---|---|
| 62 ;; The following functions must precede all defcustom-defined variables. | 62 ;; The following functions must precede all defcustom-defined variables. |
| 63 | 63 |
| 64 ;; The following functions needed for setting diff/diff3 options | 64 ;; The following functions needed for setting diff/diff3 options |
| 65 ;; test if diff supports the --binary option | 65 ;; test if diff supports the --binary option |
| 66 (defsubst ediff-test-utility (diff-util option &optional files) | 66 (defsubst ediff-test-utility (diff-util option &optional files) |
| 67 (zerop (apply 'call-process | 67 (eq 0 (apply 'call-process |
| 68 (append (list diff-util nil nil nil option) files)))) | 68 (append (list diff-util nil nil nil option) files)))) |
| 69 | 69 |
| 70 (defun ediff-diff-mandatory-option (diff-util) | 70 (defun ediff-diff-mandatory-option (diff-util) |
| 71 (let ((file (if (boundp 'null-device) null-device "/dev/null"))) | 71 (let ((file (if (boundp 'null-device) null-device "/dev/null"))) |
| 72 (cond ((not (memq system-type '(ms-dos windows-nt windows-95))) | 72 (cond ((not (memq system-type '(ms-dos windows-nt windows-95))) |
| 73 "") | 73 "") |
| 1344 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) | 1344 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) |
| 1345 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) | 1345 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) |
| 1346 ;;; End: | 1346 ;;; End: |
| 1347 | 1347 |
| 1348 | 1348 |
| 1349 ;;; arch-tag: a86d448e-58d7-4572-a1d9-fdedfa22f648 | |
| 1349 ;;; ediff-diff.el ends here | 1350 ;;; ediff-diff.el ends here |