| 1659 | | (or (ediff-buffer-live-p ediff-meta-diff-buffer) |
|---|
| 1660 | | (setq ediff-meta-diff-buffer |
|---|
| 1661 | | (get-buffer-create |
|---|
| 1662 | | (ediff-unique-buffer-name "*Ediff Multifile Diffs" "*")))) |
|---|
| 1663 | | (ediff-with-current-buffer ediff-meta-diff-buffer |
|---|
| 1664 | | (setq buffer-read-only nil) |
|---|
| 1665 | | (erase-buffer)) |
|---|
| 1666 | | (if (> (ediff-operate-on-marked-sessions 'ediff-append-custom-diff) 0) |
|---|
| 1667 | | ;; did something |
|---|
| 1668 | | (progn |
|---|
| 1669 | | (display-buffer ediff-meta-diff-buffer 'not-this-window) |
|---|
| 1670 | | (ediff-with-current-buffer ediff-meta-diff-buffer |
|---|
| 1671 | | (set-buffer-modified-p nil) |
|---|
| 1672 | | (setq buffer-read-only t))) |
|---|
| 1673 | | (beep) |
|---|
| 1674 | | (message "No marked sessions found"))) |
|---|
| | 1659 | (let ((coding-system-for-read ediff-coding-system-for-read)) |
|---|
| | 1660 | (or (ediff-buffer-live-p ediff-meta-diff-buffer) |
|---|
| | 1661 | (setq ediff-meta-diff-buffer |
|---|
| | 1662 | (get-buffer-create |
|---|
| | 1663 | (ediff-unique-buffer-name "*Ediff Multifile Diffs" "*")))) |
|---|
| | 1664 | (ediff-with-current-buffer ediff-meta-diff-buffer |
|---|
| | 1665 | (setq buffer-read-only nil) |
|---|
| | 1666 | (erase-buffer)) |
|---|
| | 1667 | (if (> (ediff-operate-on-marked-sessions 'ediff-append-custom-diff) 0) |
|---|
| | 1668 | ;; did something |
|---|
| | 1669 | (progn |
|---|
| | 1670 | (display-buffer ediff-meta-diff-buffer 'not-this-window) |
|---|
| | 1671 | (ediff-with-current-buffer ediff-meta-diff-buffer |
|---|
| | 1672 | (set-buffer-modified-p nil) |
|---|
| | 1673 | (setq buffer-read-only t)) |
|---|
| | 1674 | (if (fboundp 'diff-mode) |
|---|
| | 1675 | (with-current-buffer ediff-meta-diff-buffer |
|---|
| | 1676 | (diff-mode)))) |
|---|
| | 1677 | (beep) |
|---|
| | 1678 | (message "No marked sessions found")))) |
|---|
