/[emacs]/emacs/lisp/ediff-util.el
ViewVC logotype

Diff of /emacs/lisp/ediff-util.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.60 by deego, Sun Sep 18 12:25:01 2005 UTC revision 1.61 by kifer, Tue Sep 20 17:47:28 2005 UTC
# Line 367  to invocation.") Line 367  to invocation.")
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)

Legend:
Removed from v.1.60  
changed lines
  Added in v.1.61

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26