Mercurial > emacs
comparison lisp/ediff-merg.el @ 19047:f90d40b0bff5
new version
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Thu, 31 Jul 1997 04:04:23 +0000 |
| parents | 1405083241e8 |
| children | 9bc6a4017c8c |
comparison
equal
deleted
inserted
replaced
| 19046:689f3dc973f9 | 19047:f90d40b0bff5 |
|---|---|
| 279 (pat2 (nth 1 ediff-combination-pattern)) | 279 (pat2 (nth 1 ediff-combination-pattern)) |
| 280 (pat3 (nth 2 ediff-combination-pattern)) | 280 (pat3 (nth 2 ediff-combination-pattern)) |
| 281 reg-a-beg reg-a-end reg-b-beg reg-b-end reg-c-beg reg-c-end) | 281 reg-a-beg reg-a-end reg-b-beg reg-b-end reg-c-beg reg-c-end) |
| 282 | 282 |
| 283 (if combined | 283 (if combined |
| 284 (ediff-eval-in-buffer ediff-buffer-C | 284 (ediff-with-current-buffer ediff-buffer-C |
| 285 (goto-char reg-beg) | 285 (goto-char reg-beg) |
| 286 (search-forward pat1 reg-end 'noerror) | 286 (search-forward pat1 reg-end 'noerror) |
| 287 (setq reg-a-beg (match-beginning 0)) | 287 (setq reg-a-beg (match-beginning 0)) |
| 288 (setq reg-a-end (match-end 0)) | 288 (setq reg-a-end (match-end 0)) |
| 289 (search-forward pat2 reg-end 'noerror) | 289 (search-forward pat2 reg-end 'noerror) |
| 298 ))) | 298 ))) |
| 299 | 299 |
| 300 | 300 |
| 301 ;;; Local Variables: | 301 ;;; Local Variables: |
| 302 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) | 302 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) |
| 303 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1) | 303 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) |
| 304 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body)) | 304 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) |
| 305 ;;; End: | 305 ;;; End: |
| 306 | 306 |
| 307 ;; ediff-merg.el ends here | 307 ;; ediff-merg.el ends here |