diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2001-02-12 08:47:13 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2001-02-12 08:47:13 +0000 |
| commit | 513bea4565326a6b68e580dd3dc215bfe0bcde98 (patch) | |
| tree | 05e9081d0c4e53903a5cbc448bc725cf47400f7e /lisp/ediff-init.el | |
| parent | 36fd8e1761464aa3a557cf9cc70bf91f8331c4db (diff) | |
| download | emacs-513bea4565326a6b68e580dd3dc215bfe0bcde98.tar.gz | |
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
Diffstat (limited to 'lisp/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index bfa77a71fba..f984ac2fa30 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -381,7 +381,6 @@ that Ediff doesn't know about.") This hook can be used to save the previous window config, which can be restored on ediff-quit or ediff-suspend." :type 'hook - :version "21.1" :group 'ediff-hook) (defcustom ediff-before-setup-windows-hook nil "*Hooks to run before Ediff sets its window configuration. @@ -1221,7 +1220,6 @@ as `ediff-merge-directory' or `ediff-merge-directory-revisions'." (defcustom ediff-merge-filename-prefix "merge_" "*Prefix to be attached to saved merge buffers." :type 'string - :version "21.1" :group 'ediff-merge) (defcustom ediff-no-emacs-help-in-control-buffer nil |