Mercurial > emacs
comparison lisp/smerge-mode.el @ 90208:890cc78a5a24
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-74
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 493-503)
- Update from CVS
- Update from CVS: lisp/startup.el (command-line): Fix typo.
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 95-98)
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 29 Jul 2005 01:54:54 +0000 |
| parents | f9a65d7ebd29 a975a8beec7f |
| children | 2d92f5c9d6ae |
comparison
equal
deleted
inserted
replaced
| 90207:43ea22612328 | 90208:890cc78a5a24 |
|---|---|
| 668 (buf smerge-ediff-buf) | 668 (buf smerge-ediff-buf) |
| 669 (windows smerge-ediff-windows)) | 669 (windows smerge-ediff-windows)) |
| 670 (ediff-cleanup-mess) | 670 (ediff-cleanup-mess) |
| 671 (with-current-buffer buf | 671 (with-current-buffer buf |
| 672 (erase-buffer) | 672 (erase-buffer) |
| 673 (insert-buffer buffer-C) | 673 (insert-buffer-substring buffer-C) |
| 674 (kill-buffer buffer-A) | 674 (kill-buffer buffer-A) |
| 675 (kill-buffer buffer-B) | 675 (kill-buffer buffer-B) |
| 676 (kill-buffer buffer-C) | 676 (kill-buffer buffer-C) |
| 677 (when (bufferp buffer-Ancestor) (kill-buffer buffer-Ancestor)) | 677 (when (bufferp buffer-Ancestor) (kill-buffer buffer-Ancestor)) |
| 678 (set-window-configuration windows) | 678 (set-window-configuration windows) |