diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 1997-07-17 19:37:07 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 1997-07-17 19:37:07 +0000 |
| commit | 9f7f68a04eee49e0558d2a0b382eb2ada07ec496 (patch) | |
| tree | 841704be3db2399d75a6a4d95d6a56b9de112f55 /lisp/ediff-util.el | |
| parent | 4dee674a5ade4497947b2fb7df101531c7ecad2b (diff) | |
| download | emacs-9f7f68a04eee49e0558d2a0b382eb2ada07ec496.tar.gz | |
new version
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index 527a9e2972d..fbd5808726a 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -101,6 +101,7 @@ This mode is entered through one of the following commands: `ediff-patch-file' `ediff-patch-buffer' `epatch-buffer' + `erevision' `ediff-revision' Commands: @@ -404,7 +405,10 @@ to invocation.") (or (memq control-buffer ediff-this-buffer-ediff-sessions) (setq ediff-this-buffer-ediff-sessions (cons control-buffer ediff-this-buffer-ediff-sessions))) + (if ediff-make-buffers-readonly-at-startup + (setq buffer-read-only t)) ) + (ediff-eval-in-buffer ediff-buffer-B (ediff-nuke-selective-display) (run-hooks 'ediff-prepare-buffer-hook) @@ -414,7 +418,10 @@ to invocation.") (or (memq control-buffer ediff-this-buffer-ediff-sessions) (setq ediff-this-buffer-ediff-sessions (cons control-buffer ediff-this-buffer-ediff-sessions))) + (if ediff-make-buffers-readonly-at-startup + (setq buffer-read-only t)) ) + (if ediff-3way-job (ediff-eval-in-buffer ediff-buffer-C (ediff-nuke-selective-display) @@ -424,6 +431,8 @@ to invocation.") (setq ediff-this-buffer-ediff-sessions (cons control-buffer ediff-this-buffer-ediff-sessions))) + (if ediff-make-buffers-readonly-at-startup + (setq buffer-read-only t)) )) (if (ediff-buffer-live-p ediff-ancestor-buffer) |