Mercurial > emacs
comparison lisp/ediff-init.el @ 36043:5d6b76d28b83
2001-02-12 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-diff.el (ediff-make-diff2-buffer): Removed bogus checks
for remote files.
(ediff-coding-system-for-read): replaced the no-conversion default
with raw-text.
* ediff-init.el: Removed :version from defcustom vars.
* ediff-util.el (ediff-compute-custom-diffs-maybe): Better
handling of the diff mode
* ediff.texi: Added ediff-coding-system-for-read.
* viper.texi: typos
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Mon, 12 Feb 2001 08:47:13 +0000 |
| parents | be20c22dc16d |
| children | f6386773ce30 |
comparison
equal
deleted
inserted
replaced
| 36042:e3b6218812b0 | 36043:5d6b76d28b83 |
|---|---|
| 379 (defcustom ediff-before-setup-hook nil | 379 (defcustom ediff-before-setup-hook nil |
| 380 "*Hooks to run before Ediff begins to set up windows and buffers. | 380 "*Hooks to run before Ediff begins to set up windows and buffers. |
| 381 This hook can be used to save the previous window config, which can be restored | 381 This hook can be used to save the previous window config, which can be restored |
| 382 on ediff-quit or ediff-suspend." | 382 on ediff-quit or ediff-suspend." |
| 383 :type 'hook | 383 :type 'hook |
| 384 :version "21.1" | |
| 385 :group 'ediff-hook) | 384 :group 'ediff-hook) |
| 386 (defcustom ediff-before-setup-windows-hook nil | 385 (defcustom ediff-before-setup-windows-hook nil |
| 387 "*Hooks to run before Ediff sets its window configuration. | 386 "*Hooks to run before Ediff sets its window configuration. |
| 388 This hook is run every time when Ediff arranges its windows. | 387 This hook is run every time when Ediff arranges its windows. |
| 389 This happens each time Ediff detects that the windows were messed up by the | 388 This happens each time Ediff detects that the windows were messed up by the |
| 1219 (ediff-defvar-local ediff-merge-store-file nil "") | 1218 (ediff-defvar-local ediff-merge-store-file nil "") |
| 1220 | 1219 |
| 1221 (defcustom ediff-merge-filename-prefix "merge_" | 1220 (defcustom ediff-merge-filename-prefix "merge_" |
| 1222 "*Prefix to be attached to saved merge buffers." | 1221 "*Prefix to be attached to saved merge buffers." |
| 1223 :type 'string | 1222 :type 'string |
| 1224 :version "21.1" | |
| 1225 :group 'ediff-merge) | 1223 :group 'ediff-merge) |
| 1226 | 1224 |
| 1227 (defcustom ediff-no-emacs-help-in-control-buffer nil | 1225 (defcustom ediff-no-emacs-help-in-control-buffer nil |
| 1228 "*Non-nil means C-h should not invoke Emacs help in control buffer. | 1226 "*Non-nil means C-h should not invoke Emacs help in control buffer. |
| 1229 Instead, C-h would jump to previous difference." | 1227 Instead, C-h would jump to previous difference." |