Mercurial > emacs
comparison lisp/ediff-diff.el @ 21154:7a38d5342931
(ediff-exec-process): store-match-data => set-match-data.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 14 Mar 1998 04:43:46 +0000 |
| parents | 4327dd36b71b |
| children | f7e788ea680b |
comparison
equal
deleted
inserted
replaced
| 21153:183817081a96 | 21154:7a38d5342931 |
|---|---|
| 1108 (apply 'start-process "Custom Diff" buffer program args)) | 1108 (apply 'start-process "Custom Diff" buffer program args)) |
| 1109 (setq mode-line-process '(":%s")) | 1109 (setq mode-line-process '(":%s")) |
| 1110 (set-process-sentinel proc 'ediff-process-sentinel) | 1110 (set-process-sentinel proc 'ediff-process-sentinel) |
| 1111 (set-process-filter proc 'ediff-process-filter) | 1111 (set-process-filter proc 'ediff-process-filter) |
| 1112 ))) | 1112 ))) |
| 1113 (store-match-data data)))) | 1113 (set-match-data data)))) |
| 1114 | 1114 |
| 1115 ;; This is shell-command-filter from simple.el in FSF Emacs. | 1115 ;; This is shell-command-filter from simple.el in FSF Emacs. |
| 1116 ;; Copied here because XEmacs doesn't have it. | 1116 ;; Copied here because XEmacs doesn't have it. |
| 1117 (defun ediff-process-filter (proc string) | 1117 (defun ediff-process-filter (proc string) |
| 1118 ;; Do save-excursion by hand so that we can leave point numerically unchanged | 1118 ;; Do save-excursion by hand so that we can leave point numerically unchanged |