Mercurial > emacs
comparison lisp/ediff-merg.el @ 16248:b2fae8abc5b0
*** empty log message ***
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Fri, 20 Sep 1996 01:10:05 +0000 |
| parents | 43a3308fcf61 |
| children | 0b9d9cbf3cd4 |
comparison
equal
deleted
inserted
replaced
| 16247:a0940ace16a3 | 16248:b2fae8abc5b0 |
|---|---|
| 262 (if (and reg-a-beg reg-a-end reg-b-beg reg-b-end) | 262 (if (and reg-a-beg reg-a-end reg-b-beg reg-b-end) |
| 263 (list reg-a-beg reg-a-end reg-b-beg reg-b-end reg-c-beg reg-c-end)) | 263 (list reg-a-beg reg-a-end reg-b-beg reg-b-end reg-c-beg reg-c-end)) |
| 264 ))) | 264 ))) |
| 265 | 265 |
| 266 | 266 |
| 267 ;;; Local Variables: | |
| 268 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) | |
| 269 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1) | |
| 270 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body)) | |
| 271 ;;; End: | |
| 272 | |
| 267 (provide 'ediff-merg) | 273 (provide 'ediff-merg) |
| 268 | 274 |
| 269 ;; ediff-merg.el ends here | 275 ;; ediff-merg.el ends here |