Mercurial > emacs
comparison lisp/ediff-util.el @ 18839:1405083241e8
new version
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Thu, 17 Jul 1997 19:37:07 +0000 |
| parents | 0b9d9cbf3cd4 |
| children | 47924b18d95c |
comparison
equal
deleted
inserted
replaced
| 18838:6f9fa4c8e92a | 18839:1405083241e8 |
|---|---|
| 99 `ediff-regions-linewise' | 99 `ediff-regions-linewise' |
| 100 `epatch' | 100 `epatch' |
| 101 `ediff-patch-file' | 101 `ediff-patch-file' |
| 102 `ediff-patch-buffer' | 102 `ediff-patch-buffer' |
| 103 `epatch-buffer' | 103 `epatch-buffer' |
| 104 `erevision' | |
| 104 `ediff-revision' | 105 `ediff-revision' |
| 105 | 106 |
| 106 Commands: | 107 Commands: |
| 107 \\{ediff-mode-map}" | 108 \\{ediff-mode-map}" |
| 108 (kill-all-local-variables) | 109 (kill-all-local-variables) |
| 402 ;; add control-buffer to the list of sessions--no longer used, but may | 403 ;; add control-buffer to the list of sessions--no longer used, but may |
| 403 ;; be used again in the future | 404 ;; be used again in the future |
| 404 (or (memq control-buffer ediff-this-buffer-ediff-sessions) | 405 (or (memq control-buffer ediff-this-buffer-ediff-sessions) |
| 405 (setq ediff-this-buffer-ediff-sessions | 406 (setq ediff-this-buffer-ediff-sessions |
| 406 (cons control-buffer ediff-this-buffer-ediff-sessions))) | 407 (cons control-buffer ediff-this-buffer-ediff-sessions))) |
| 408 (if ediff-make-buffers-readonly-at-startup | |
| 409 (setq buffer-read-only t)) | |
| 407 ) | 410 ) |
| 411 | |
| 408 (ediff-eval-in-buffer ediff-buffer-B | 412 (ediff-eval-in-buffer ediff-buffer-B |
| 409 (ediff-nuke-selective-display) | 413 (ediff-nuke-selective-display) |
| 410 (run-hooks 'ediff-prepare-buffer-hook) | 414 (run-hooks 'ediff-prepare-buffer-hook) |
| 411 (if (ediff-eval-in-buffer control-buffer ediff-merge-job) | 415 (if (ediff-eval-in-buffer control-buffer ediff-merge-job) |
| 412 (setq buffer-read-only t)) | 416 (setq buffer-read-only t)) |
| 413 ;; add control-buffer to the list of sessions | 417 ;; add control-buffer to the list of sessions |
| 414 (or (memq control-buffer ediff-this-buffer-ediff-sessions) | 418 (or (memq control-buffer ediff-this-buffer-ediff-sessions) |
| 415 (setq ediff-this-buffer-ediff-sessions | 419 (setq ediff-this-buffer-ediff-sessions |
| 416 (cons control-buffer ediff-this-buffer-ediff-sessions))) | 420 (cons control-buffer ediff-this-buffer-ediff-sessions))) |
| 421 (if ediff-make-buffers-readonly-at-startup | |
| 422 (setq buffer-read-only t)) | |
| 417 ) | 423 ) |
| 424 | |
| 418 (if ediff-3way-job | 425 (if ediff-3way-job |
| 419 (ediff-eval-in-buffer ediff-buffer-C | 426 (ediff-eval-in-buffer ediff-buffer-C |
| 420 (ediff-nuke-selective-display) | 427 (ediff-nuke-selective-display) |
| 421 (run-hooks 'ediff-prepare-buffer-hook) | 428 (run-hooks 'ediff-prepare-buffer-hook) |
| 422 ;; add control-buffer to the list of sessions | 429 ;; add control-buffer to the list of sessions |
| 423 (or (memq control-buffer ediff-this-buffer-ediff-sessions) | 430 (or (memq control-buffer ediff-this-buffer-ediff-sessions) |
| 424 (setq ediff-this-buffer-ediff-sessions | 431 (setq ediff-this-buffer-ediff-sessions |
| 425 (cons control-buffer | 432 (cons control-buffer |
| 426 ediff-this-buffer-ediff-sessions))) | 433 ediff-this-buffer-ediff-sessions))) |
| 434 (if ediff-make-buffers-readonly-at-startup | |
| 435 (setq buffer-read-only t)) | |
| 427 )) | 436 )) |
| 428 | 437 |
| 429 (if (ediff-buffer-live-p ediff-ancestor-buffer) | 438 (if (ediff-buffer-live-p ediff-ancestor-buffer) |
| 430 (ediff-eval-in-buffer ediff-ancestor-buffer | 439 (ediff-eval-in-buffer ediff-ancestor-buffer |
| 431 (ediff-nuke-selective-display) | 440 (ediff-nuke-selective-display) |