Mercurial > emacs
comparison lisp/ediff-vers.el @ 90201:fbb2bea03df9
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-69
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 474-484)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 88-91)
- Merge from emacs--cvs-trunk--0
- Update FSF's address in GPL notices
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 14 Jul 2005 08:02:00 +0000 |
| parents | f9a65d7ebd29 a4c59075cac8 |
| children | 2d92f5c9d6ae |
comparison
equal
deleted
inserted
replaced
| 90200:f9a65d7ebd29 | 90201:fbb2bea03df9 |
|---|---|
| 302 nil ; startup-hooks | 302 nil ; startup-hooks |
| 303 'ediff-revisions))) | 303 'ediff-revisions))) |
| 304 (if (stringp tmp-file) (delete-file tmp-file)) | 304 (if (stringp tmp-file) (delete-file tmp-file)) |
| 305 (if (stringp ancestor-file) (delete-file ancestor-file)))) | 305 (if (stringp ancestor-file) (delete-file ancestor-file)))) |
| 306 | 306 |
| 307 | |
| 308 (provide 'ediff-vers) | |
| 309 | |
| 307 ;;; Local Variables: | 310 ;;; Local Variables: |
| 308 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) | 311 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) |
| 309 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) | 312 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) |
| 310 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) | 313 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) |
| 311 ;;; End: | 314 ;;; End: |
| 312 | 315 |
| 313 (provide 'ediff-vers) | |
| 314 | |
| 315 ;;; arch-tag: bbb34f0c-2a90-426a-a77a-c75f479ebbbf | 316 ;;; arch-tag: bbb34f0c-2a90-426a-a77a-c75f479ebbbf |
| 316 ;;; ediff-vers.el ends here | 317 ;;; ediff-vers.el ends here |