summaryrefslogtreecommitdiff
path: root/lisp/ediff.el
Commit message (Expand)AuthorAgeFilesLines
* Merge from emacs--rel--22Miles Bader2008-01-081-1/+1
|\
| * Add 2008 to copyright years.Glenn Morris2008-01-071-1/+1
* | Fix possibly buggy calls to `message'.Deepak Goel2007-12-061-1/+1
* | Load dired and ediff-*.el files silently.Glenn Morris2007-11-271-9/+9
* | * mail/mspools.el (rmail-get-new-mail):Dan Nicolaescu2007-11-251-0/+1
* | * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.Dan Nicolaescu2007-11-091-1/+1
* | * progmodes/mixal-mode.el (mixal-run, mixal-debug): Call mixvmDan Nicolaescu2007-10-311-14/+0
* | 2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2007-08-191-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-13 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2007-06-131-2/+2
|/
* 2007-01-23 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2007-01-231-8/+2
* Add 2007 to copyright years.Glenn Morris2007-01-211-1/+1
* (ediff-revision): Use `format', not `message', in `y-or-n-p' call.Juanma Barranquero2006-11-131-2/+2
* 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2006-10-231-1/+1
* * viper.el: Bumped up version/date of update to reflect the substantialMichael Kifer2006-09-181-32/+38
* 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2006-06-181-41/+39
* (ediff-files, ediff-files3, ediff-merge-files)Kim F. Storm2006-05-051-38/+30
* 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2006-02-191-4/+7
* Update years in copyright notice; nfc.Thien-Thi Nguyen2006-02-061-1/+1
* 2005-11-25 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2005-11-251-1/+1
* 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2005-10-061-1/+1
* 2005-09-24 Emilio C. Lopes <eclig@gmx.net>Romain Francoise2005-09-241-7/+7
* 2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2005-09-201-2/+2
* Update years in copyright notice; nfc.Thien-Thi Nguyen2005-08-061-1/+2
* * viper-cmd.el (viper-escape-to-state): bug fixMichael Kifer2005-07-191-5/+7
* * viper-cmd.el (viper--key-maps): new variable.Michael Kifer2005-07-101-5/+5
* Update FSF's address.Lute Kamstra2005-07-041-2/+2
* (ediff): Finish `defgroup' description with period.Juanma Barranquero2005-07-041-2/+2
* 2005-06-03 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2005-06-031-1/+1
* * ediff.el (ediff-set-diff-overlays-in-one-buffer,Michael Kifer2005-02-191-5/+8
* Move Ediff's debug-ignored-errors from bindings.el.Juri Linkov2004-06-061-0/+47
* 2003-10-12 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2003-10-131-38/+69
* Add arch taglinesMiles Bader2003-09-011-0/+1
* 2003-05-18 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2003-05-181-15/+36
* Trailing whitespace deleted.Juanma Barranquero2003-02-041-103/+103
* 2003-01-25 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2003-01-251-5/+5
* 2002-11-17 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2002-11-171-10/+11
* (ediff-backup): New autoloaded command.Markus Rost2002-07-311-0/+16
* * ediff-diff.el (ediff-install-fine-diff-if-necessary): takeMichael Kifer2002-03-201-52/+3
* * ediff-init.el: comments.Michael Kifer2002-03-051-23/+41
* Fix typo.Pavel Janík2002-01-131-1/+1
* 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2002-01-081-39/+91
* * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesyMichael Kifer2001-07-211-2/+2
* 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer2001-03-171-2/+2
* 2001-01-19 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer2001-01-191-3/+3
* 2000-12-25 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer2000-12-251-9/+23
* * ediff.el (ediff-regions-internal, ediff-documentation):Dave Love2000-11-101-1/+5
* 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer2000-10-291-14/+28
* * viper-cmd.el (viper-envelop-ESC-key): added the option toMichael Kifer2000-02-281-1/+1
View Lorry Controller Status