| Mon, 28 Jun 2004 07:56:49 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
|
| Fri, 16 Apr 2004 12:51:06 +0000 |
Kenichi Handa |
Sync to HEAD
|
| Mon, 16 Jan 2006 00:03:54 +0000 |
Henrik Enberg |
sync with trunk
|
| Mon, 08 Sep 2003 11:56:09 +0000 |
Kenichi Handa |
New directory
|
| Wed, 16 Jan 2008 06:22:59 +0000 |
Dan Nicolaescu |
* smerge-mode.el (smerge-start-session): Rename from smerge-auto.
|
| Tue, 15 Jan 2008 21:40:09 +0000 |
Stefan Monnier |
(smerge-refine): Also work on "same change conflicts".
|
| Mon, 14 Jan 2008 07:38:05 +0000 |
Dan Nicolaescu |
* smerge-mode.el (smerge-auto): New function.
|
| Tue, 08 Jan 2008 20:46:54 +0000 |
Miles Bader |
Merge from emacs--rel--22
|
| Mon, 19 Nov 2007 08:50:04 +0000 |
Dan Nicolaescu |
* progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
|
| Thu, 08 Nov 2007 16:58:07 +0000 |
Stefan Monnier |
(smerge-refine-subst): Pass "-d" to diff.
|
| Sat, 20 Oct 2007 06:30:18 +0000 |
Dan Nicolaescu |
* term/x-win.el (x-gtk-stock-map, icon-map-list)
|
| Sat, 20 Oct 2007 01:52:22 +0000 |
Stefan Monnier |
(smerge-auto-refine): New var.
|
| Fri, 19 Oct 2007 15:59:13 +0000 |
Stefan Monnier |
Add word-granularity refinement.
|
| Tue, 09 Oct 2007 03:38:57 +0000 |
Stefan Monnier |
(smerge-refine-chopup-region): Add `preproc' argument.
|
| Sun, 22 Apr 2007 12:12:29 +0000 |
Karoly Lorentey |
Merged from emacs@sv.gnu.org
|
| Mon, 29 Jan 2007 22:21:19 +0000 |
Karoly Lorentey |
Merged from emacs@sv.gnu.org
|
| Wed, 03 May 2006 11:56:53 +0000 |
Karoly Lorentey |
Merged from emacs@sv.gnu.org
|
| Sun, 12 Feb 2006 00:15:44 +0000 |
Karoly Lorentey |
Merged from emacs@sv.gnu.org
|
| Tue, 01 Nov 2005 06:23:08 +0000 |
Karoly Lorentey |
Merged from miles@gnu.org--gnu-2005 (patch 142-148, 615-628)
|
| Sun, 09 Oct 2005 20:00:17 +0000 |
Karoly Lorentey |
Merged from miles@gnu.org--gnu-2005 (patch 118-132, 551-577)
|
| Fri, 09 Sep 2005 20:52:13 +0000 |
Karoly Lorentey |
Merged in changes from CVS trunk.
|
| Sun, 04 Sep 2005 03:48:17 +0000 |
Karoly Lorentey |
Merged in changes from CVS trunk. Plus added lisp/term tweaks.
|
| Tue, 05 Jul 2005 22:22:24 +0000 |
Karoly Lorentey |
Merged from miles@gnu.org--gnu-2005 (patch 469)
|
| Tue, 05 Jul 2005 22:12:55 +0000 |
Karoly Lorentey |
Merged from miles@gnu.org--gnu-2005 (patch 83-87, 449-468)
|
| Tue, 21 Jun 2005 15:42:45 +0000 |
Karoly Lorentey |
Merged from miles@gnu.org--gnu-2005 (patch 423-434)
|
| Wed, 15 Jun 2005 12:57:51 +0000 |
Karoly Lorentey |
Merged from miles@gnu.org--gnu-2005 (patch 80-82, 350-422)
|
| Mon, 11 Apr 2005 12:40:15 +0000 |
Karoly Lorentey |
Merged from miles@gnu.org--gnu-2005 (patch 59, 240-245)
|
| Mon, 04 Apr 2005 16:43:15 +0000 |
Karoly Lorentey |
Merged from miles@gnu.org--gnu-2005 (patch 45-55, 214-231)
|
| Sat, 01 May 2004 19:23:22 +0000 |
Karoly Lorentey |
Merged in changes from CVS trunk.
|
| Fri, 16 Apr 2004 13:36:07 +0000 |
Karoly Lorentey |
Merged in changes from CVS trunk.
|
| Thu, 15 Apr 2004 16:49:22 +0000 |
Karoly Lorentey |
Merged in changes from CVS trunk.
|
| Thu, 25 Mar 2004 22:21:45 +0000 |
Karoly Lorentey |
Merged in changes from CVS HEAD
|
| Fri, 19 Mar 2004 22:32:48 +0000 |
Karoly Lorentey |
Merged in changes from CVS HEAD
|
| Tue, 16 Mar 2004 20:27:22 +0000 |
Karoly Lorentey |
Merged in changes from CVS HEAD
|
| Sat, 10 May 2008 13:06:33 +0000 |
Reiner Steib |
(smerge-command-prefix): Fix custom type.
|
| Mon, 07 Jan 2008 02:45:14 +0000 |
Glenn Morris |
Add 2008 to copyright years.
|
| Thu, 16 Aug 2007 20:04:36 +0000 |
Stefan Monnier |
(smerge-resolve): New arg `safe'.
|
| Wed, 25 Jul 2007 04:47:42 +0000 |
Glenn Morris |
Switch license to GPLv3 or later.
|
| Thu, 08 Mar 2007 20:12:55 +0000 |
Stefan Monnier |
(smerge-remove-props): Don't mark the buffer modified.
|
| Sun, 21 Jan 2007 03:53:13 +0000 |
Glenn Morris |
Add 2007 to copyright years.
|
| Sun, 30 Apr 2006 15:49:08 +0000 |
Stefan Monnier |
Update my email address.
|
| Mon, 06 Feb 2006 15:23:23 +0000 |
Thien-Thi Nguyen |
Update years in copyright notice; nfc.
|
| Wed, 26 Oct 2005 08:38:07 +0000 |
Romain Francoise |
Add 'tools' to file keywords.
|
| Fri, 23 Sep 2005 18:15:20 +0000 |
Stefan Monnier |
(smerge-remove-props): Cause re-highlighting of the whole conflict.
|
| Fri, 09 Sep 2005 01:16:05 +0000 |
Richard M. Stallman |
(smerge-resolve): Pass args to smerge-remove-props.
|
| Fri, 26 Aug 2005 09:37:04 +0000 |
Juanma Barranquero |
(smerge-refined-change): Add :group.
|
| Thu, 25 Aug 2005 20:13:38 +0000 |
Stefan Monnier |
(smerge-remove-props): Make the args non-optional.
|
| Mon, 22 Aug 2005 14:38:51 +0000 |
Stefan Monnier |
(smerge-basic-map): Bind smerge-combine-with-next.
|
| Sat, 06 Aug 2005 22:13:43 +0000 |
Thien-Thi Nguyen |
Update years in copyright notice; nfc.
|
| Tue, 26 Jul 2005 16:07:55 +0000 |
Stefan Monnier |
(smerge-ediff): Use insert-buffer-substring.
|
| Mon, 04 Jul 2005 23:32:44 +0000 |
Lute Kamstra |
Update FSF's address.
|
| Sun, 03 Jul 2005 16:12:14 +0000 |
Richard M. Stallman |
(smerge-mode): Add duplicate defvar near top.
|
| Thu, 16 Jun 2005 14:34:12 +0000 |
Juanma Barranquero |
(smerge-ensure-match): Don't use `format' on `error' arguments.
|
| Fri, 10 Jun 2005 08:48:08 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
|
| Fri, 08 Apr 2005 14:26:13 +0000 |
Dan Nicolaescu |
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
|
| Mon, 04 Apr 2005 09:09:01 +0000 |
Lute Kamstra |
(smerge-mode): Specify :group.
|
| Fri, 30 Apr 2004 21:10:05 +0000 |
Juanma Barranquero |
(smerge-diff-switches): Fix typo in docstring.
|
| Thu, 15 Apr 2004 20:46:54 +0000 |
Stefan Monnier |
(smerge-match-conflict): Fix last change.
|
| Thu, 15 Apr 2004 20:19:11 +0000 |
Stefan Monnier |
(smerge-match-conflict): Try to do something sensible
|
| Wed, 14 Apr 2004 17:40:57 +0000 |
Stefan Monnier |
(smerge-popup-context-menu): Use it.
|
