Mercurial > emacs
comparison lisp/ediff.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 | 187d6a1f84f7 |
comparison
equal
deleted
inserted
replaced
| 90200:f9a65d7ebd29 | 90201:fbb2bea03df9 |
|---|---|
| 5 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 ;; Created: February 2, 1994 | 6 ;; Created: February 2, 1994 |
| 7 ;; Keywords: comparing, merging, patching, tools, unix | 7 ;; Keywords: comparing, merging, patching, tools, unix |
| 8 | 8 |
| 9 (defconst ediff-version "2.80" "The current version of Ediff") | 9 (defconst ediff-version "2.80" "The current version of Ediff") |
| 10 (defconst ediff-date "June 3, 2005" "Date of last update") | 10 (defconst ediff-date "July 8, 2005" "Date of last update") |
| 11 | 11 |
| 12 | 12 |
| 13 ;; This file is part of GNU Emacs. | 13 ;; This file is part of GNU Emacs. |
| 14 | 14 |
| 15 ;; GNU Emacs is free software; you can redistribute it and/or modify | 15 ;; GNU Emacs is free software; you can redistribute it and/or modify |
| 1524 "^There is no file to merge$" | 1524 "^There is no file to merge$" |
| 1525 "^Version control package .*.el not found. Use vc.el instead$")) | 1525 "^Version control package .*.el not found. Use vc.el instead$")) |
| 1526 (add-to-list 'debug-ignored-errors mess)) | 1526 (add-to-list 'debug-ignored-errors mess)) |
| 1527 | 1527 |
| 1528 | 1528 |
| 1529 (require 'ediff-util) | |
| 1530 | |
| 1531 (run-hooks 'ediff-load-hook) | |
| 1532 | |
| 1529 ;;; Local Variables: | 1533 ;;; Local Variables: |
| 1530 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) | 1534 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) |
| 1531 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) | 1535 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) |
| 1532 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) | 1536 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) |
| 1533 ;;; End: | 1537 ;;; End: |
| 1534 | 1538 |
| 1535 (require 'ediff-util) | |
| 1536 | |
| 1537 (run-hooks 'ediff-load-hook) | |
| 1538 | |
| 1539 ;;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc | 1539 ;;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc |
| 1540 ;;; ediff.el ends here | 1540 ;;; ediff.el ends here |