summaryrefslogtreecommitdiff
path: root/lisp/ediff-init.el
Commit message (Expand)AuthorAgeFilesLines
* Move version control related files to the "vc" subdirectory.Juri Linkov2010-06-111-1821/+0
* Add 2010 to copyright years.Glenn Morris2010-01-131-1/+1
* 2009-12-07 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2009-12-071-1/+2
* 2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2009-11-221-0/+3
* 2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2009-08-151-1/+3
* Add 2009 to copyright years.Glenn Morris2009-01-051-1/+1
* * align.el:Lute Kamstra2008-12-031-29/+29
* (ediff-coding-system-for-read): Doc fix.Eli Zaretskii2008-10-191-4/+4
* * bitmaps/README:Dan Nicolaescu2008-07-311-2/+0
* Switch to recommended form of GPLv3 permissions notice.Glenn Morris2008-05-061-6/+4
* Remove unnecessary variable declarations.Glenn Morris2008-05-031-1/+0
* (ediff-check-version): Drop support for very old Emacs versions. AddGlenn Morris2008-04-231-26/+20
* 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2008-04-041-2/+2
* Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.Glenn Morris2008-03-051-170/+123
* * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.Dan Nicolaescu2008-03-051-24/+19
* (ediff-clear-fine-diff-vector): Use mapc rather than mapcar.Glenn Morris2008-03-041-2/+2
* Merge from emacs--rel--22Miles Bader2008-01-081-1/+1
|\
| * Add 2008 to copyright years.Glenn Morris2008-01-071-1/+1
* | Fix buggy calls to `error'.Deepak Goel2007-12-061-2/+2
* | Don't load ange-ftp when compiling.Glenn Morris2007-11-271-4/+0
* | * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.Dan Nicolaescu2007-11-091-31/+26
* | Merge from emacs--rel--22Miles Bader2007-10-091-1/+1
|\ \ | |/
| * (ediff-verbose-p): This var is not a constant.Stefan Monnier2007-09-161-1/+1
* | Merge from emacs--rel--22Miles Bader2007-07-261-1/+1
|\ \ | |/
| * Switch license to GPLv3 or later.Glenn Morris2007-07-251-1/+1
* | 2007-06-12 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2007-06-121-1/+3
* | (ediff-defvar-local, ediff-with-current-buffer):Stefan Monnier2007-05-251-6/+8
|/
* Add 2007 to copyright years.Glenn Morris2007-01-211-1/+1
* (ediff-autostore-merges): Doc fix.Juanma Barranquero2007-01-101-3/+4
* 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2006-02-191-0/+1
* Update years in copyright notice; nfc.Thien-Thi Nguyen2006-02-061-1/+1
* Use (featurep 'xemacs).Richard M. Stallman2005-08-091-5/+5
* Update years in copyright notice; nfc.Thien-Thi Nguyen2005-08-061-1/+1
* * viper-cmd.el (viper--key-maps): new variable.Michael Kifer2005-07-101-70/+38
* Update FSF's address.Lute Kamstra2005-07-041-2/+2
* (ediff-highlighting, ediff-merge, ediff-hook): Finish `defgroup' descriptionJuanma Barranquero2005-07-041-4/+4
* Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432Miles Bader2005-06-171-76/+108
* Use (featurep 'xemacs).Kim F. Storm2005-04-051-5/+6
* * ediff.el (ediff-set-diff-overlays-in-one-buffer,Michael Kifer2005-02-191-6/+4
* From Dan Nicolaescu <dann@ics.uci.edu>Kim F. Storm2004-09-171-60/+175
* (ediff-hide-face): Check that facemenu-unlisted-faces is bound before using it.Stefan Monnier2004-03-261-3/+4
* Add arch taglinesMiles Bader2003-09-011-0/+1
* Trailing whitespace deleted.Juanma Barranquero2003-02-041-3/+3
* 2002-10-12 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2002-10-121-1/+1
* * ediff-init.el (ediff-get-next-window): bug fix.Michael Kifer2002-09-231-4/+4
* 2002-09-18 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2002-09-181-18/+17
* (ediff-current-diff-face-A)Eli Zaretskii2002-04-151-28/+56
* * ediff-diff.el (ediff-install-fine-diff-if-necessary): takeMichael Kifer2002-03-201-6/+13
* * ediff-init.el: comments.Michael Kifer2002-03-051-1/+2
* 2002-02-10 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2002-02-101-0/+8
View Lorry Controller Status