367 |
(ediff-unique-buffer-name "*ediff-merge" "*"))) |
(ediff-unique-buffer-name "*ediff-merge" "*"))) |
368 |
(save-excursion |
(save-excursion |
369 |
(set-buffer buffer-C) |
(set-buffer buffer-C) |
370 |
(insert-buffer buf) |
(insert-buffer-substring buf) |
371 |
(funcall (ediff-with-current-buffer buf major-mode)) |
(funcall (ediff-with-current-buffer buf major-mode)) |
372 |
(widen) ; merge buffer is always widened |
(widen) ; merge buffer is always widened |
373 |
(add-hook 'local-write-file-hooks 'ediff-set-merge-mode nil t) |
(add-hook 'local-write-file-hooks 'ediff-set-merge-mode nil t) |