Bitbucket is a code hosting site with unlimited public and private repositories. We're also free for small teams!

Close
**** EDIFF -- a comprehensive interface to diff for Emacs and XEmacs

This directory:

README	    	-- This file
Makefile	-- Automated installation file
ediff.texi	-- Manual in Texinfo format
ediff, ediff-?	-- The Info files
ediff.dvi	-- Manual in DVI format

ediff.el    	-- Ediff Emacs Lisp code
ediff-init.el	-- Ediff Emacs Lisp code
ediff-help.el	-- Ediff Emacs Lisp code
ediff-wind.el	-- Ediff Emacs Lisp code
ediff-util.el	-- Ediff Emacs Lisp code
ediff-diff.el	-- Ediff Emacs Lisp code
ediff-merg.el	-- Ediff Emacs Lisp code
ediff-mult.el   -- Ediff Emacs Lisp code
ediff-vers.el	-- Ediff Emacs Lisp code
ediff-ptch.el	-- Ediff Emacs Lisp code
ediff-tbar.el	-- Ediff Emacs Lisp code -- for XEmacs only
ediff-hook.el	-- Ediff Emacs Lisp code
toolbar/	-- Ediff toolbar icons   -- for XEmacs only


To install Ediff do:

		uncompress ediff.tar.Z
		tar xf ediff.tar


Then do the following:

1. To compile Lisp:
		
      	    	make  (or 'make all')
   
2. You can also type

	       make install
	       
   to do what "make all" does plus it will copy the files ediff*.elc
   into a suitable Lisp directory.
   
   To make this happen, you will most likely have to change the PREFIX
   variable in Makefile and, possibly, one or more of these variables:
   
   	DATADIR, LISPDIR, INFODIR, ETCDIR, and VERSION
	
   if they don't point to the right directories in your installation.
   You also need to have a write permission for all directories
   mentioned in LISPDIR, INFODIR, and ETCDIR.
   
3. XEmacs users must invoke `make' with the parameter EMACS=xemacs.
   Even better: edit Makefile directly.

4. Under XEmacs, copy the icons in the `toolbar' directory into
   the-directory-where-xemacs-installed/etc/toolbar/

Normally, all Ediff menus and autoloads are already defined in Emacs, so you
don't need to define anything in your .emacs to run Ediff.
However, if it was announced that this distribution of Ediff contains
new features, you may need to put 

(require 'ediff-hook)

in your .emacs to take advantage of these new features. This doesn't load
Ediff, but readies Emacs for the things to come. When this version of
Ediff gets installed in the standard Emacs distribution, you can remove
the above require-statement (but leaving it in does no harm).

Recent activity

Vin Shelton

Commits by Vin Shelton were pushed to xemacs/ediff

bdbc67c - Fix broken requires caused by tramp update
viteno-guest

Commits by viteno-guest were pushed to xemacs/ediff

949dd9a - Increment VERSION in Makefile
kifer-guest

Commits by kifer-guest were pushed to xemacs/ediff

d62da95 - 2009-12-19 Michael Kifer <kifer@cs.stonybrook.edu> * ediff-patch.el (ediff-context-diff-label-regexp): regexp fix from the emacs tree.
viteno-guest

Commits by viteno-guest were pushed to xemacs/ediff

7828d62 - Increment VERSION in Makefile
kifer-guest

Commits by kifer-guest were pushed to xemacs/ediff

3ca7520 - 2009-12-07 Michael Kifer <kifer@cs.stonybrook.edu> * ediff-init.el (ediff-event-key): use event-to-character instead of event-key. * ediff-mult.el (ediff-setup-meta-map, ediff-prepare-meta-buffer): add menus to the meta mode. (Dan Nicolaescu's <dann@ics.uci.edu> ...
viteno-guest

Commits by viteno-guest were pushed to xemacs/ediff

37ca9c0 - Increment VERSION in Makefile
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.