Mercurial > emacs
comparison lisp/emerge.el @ 90225:a3716f7538f2
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-79
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 519-530)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 106-111)
- Merge from emacs--cvs-trunk--0
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 06 Sep 2005 00:25:20 +0000 |
| parents | 2d92f5c9d6ae 2fe9e9280f25 |
| children | 14c4a6aac623 |
comparison
equal
deleted
inserted
replaced
| 90224:2d92f5c9d6ae | 90225:a3716f7538f2 |
|---|---|
| 42 ;;;###autoload (define-key menu-bar-emerge-menu [emerge-buffers-with-ancestor] | 42 ;;;###autoload (define-key menu-bar-emerge-menu [emerge-buffers-with-ancestor] |
| 43 ;;;###autoload '("Buffers with Ancestor..." . emerge-buffers-with-ancestor)) | 43 ;;;###autoload '("Buffers with Ancestor..." . emerge-buffers-with-ancestor)) |
| 44 ;;;###autoload (define-key menu-bar-emerge-menu [emerge-buffers] | 44 ;;;###autoload (define-key menu-bar-emerge-menu [emerge-buffers] |
| 45 ;;;###autoload '("Buffers..." . emerge-buffers)) | 45 ;;;###autoload '("Buffers..." . emerge-buffers)) |
| 46 | 46 |
| 47 (eval-when-compile | 47 ;; There aren't really global variables, just dynamic bindings |
| 48 ;; There aren't really global variables, just dynamic bindings | 48 (defvar A-begin) |
| 49 (defvar merge-begin) (defvar merge-end) (defvar template) | 49 (defvar A-end) |
| 50 (defvar A-begin) (defvar A-end) (defvar B-begin) (defvar B-end) | 50 (defvar B-begin) |
| 51 (defvar diff) (defvar diff-vector) (defvar valid-diff)) | 51 (defvar B-end) |
| 52 (defvar diff) | |
| 53 (defvar diff-vector) | |
| 54 (defvar merge-begin) | |
| 55 (defvar merge-end) | |
| 56 (defvar template) | |
| 57 (defvar valid-diff) | |
| 52 | 58 |
| 53 ;;; Macros | 59 ;;; Macros |
| 54 | 60 |
| 55 (defmacro emerge-eval-in-buffer (buffer &rest forms) | 61 (defmacro emerge-eval-in-buffer (buffer &rest forms) |
| 56 "Macro to switch to BUFFER, evaluate FORMS, returns to original buffer. | 62 "Macro to switch to BUFFER, evaluate FORMS, returns to original buffer. |