diff options
| author | Stefan Monnier <[email protected]> | 2005-07-26 16:07:55 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2005-07-26 16:07:55 +0000 |
| commit | a34ed813d1c8fa8305c07dbcb14492c041131c88 (patch) | |
| tree | e57ddc961325c2a0a60ff30bf1e70d0b8523ab13 /lisp/smerge-mode.el | |
| parent | cbfde7a0798d4218e7638ef756d22f51d1a68a42 (diff) | |
(smerge-ediff): Use insert-buffer-substring.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 45e68750cb..a40486ffd0 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -670,7 +670,7 @@ buffer names." (ediff-cleanup-mess) (with-current-buffer buf (erase-buffer) - (insert-buffer buffer-C) + (insert-buffer-substring buffer-C) (kill-buffer buffer-A) (kill-buffer buffer-B) (kill-buffer buffer-C) |