Mercurial > emacs
comparison lisp/ediff-util.el @ 23381:4f20b9ddbea6
(ediff-arrange-auto-save-in-merge-jobs): Renamed
from ediff-arrange-autosave-in-merge-jobs. Callers changed.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Tue, 06 Oct 1998 23:21:47 +0000 |
| parents | 3261e4a5f472 |
| children | 4b1d22478c9f |
comparison
equal
deleted
inserted
replaced
| 23380:0088626fec1c | 23381:4f20b9ddbea6 |
|---|---|
| 498 | 498 |
| 499 (select-window ediff-control-window) | 499 (select-window ediff-control-window) |
| 500 (ediff-visible-region) | 500 (ediff-visible-region) |
| 501 | 501 |
| 502 (run-hooks 'startup-hooks) | 502 (run-hooks 'startup-hooks) |
| 503 (ediff-arrange-autosave-in-merge-jobs merge-buffer-file) | 503 (ediff-arrange-auto-save-in-merge-jobs merge-buffer-file) |
| 504 | 504 |
| 505 (ediff-refresh-mode-lines) | 505 (ediff-refresh-mode-lines) |
| 506 (setq buffer-read-only t) | 506 (setq buffer-read-only t) |
| 507 (setq ediff-session-registry | 507 (setq ediff-session-registry |
| 508 (cons control-buffer ediff-session-registry)) | 508 (cons control-buffer ediff-session-registry)) |
| 550 (goto-char (point-min)) | 550 (goto-char (point-min)) |
| 551 (skip-chars-forward ediff-whitespace))) | 551 (skip-chars-forward ediff-whitespace))) |
| 552 | 552 |
| 553 ;; This executes in control buffer and sets auto-save, visited file name, etc, | 553 ;; This executes in control buffer and sets auto-save, visited file name, etc, |
| 554 ;; in the merge buffer | 554 ;; in the merge buffer |
| 555 (defun ediff-arrange-autosave-in-merge-jobs (merge-buffer-file) | 555 (defun ediff-arrange-auto-save-in-merge-jobs (merge-buffer-file) |
| 556 (if (not ediff-merge-job) | 556 (if (not ediff-merge-job) |
| 557 () | 557 () |
| 558 (if (stringp merge-buffer-file) | 558 (if (stringp merge-buffer-file) |
| 559 (setq ediff-autostore-merges t | 559 (setq ediff-autostore-merges t |
| 560 ediff-merge-store-file merge-buffer-file)) | 560 ediff-merge-store-file merge-buffer-file)) |